Skip to content
This repository was archived by the owner on May 22, 2025. It is now read-only.

Commit cf7ca4e

Browse files
committed
TGS Test Merge (#21402)
2 parents 06e8f4a + 7429317 commit cf7ca4e

File tree

5 files changed

+9
-5
lines changed

5 files changed

+9
-5
lines changed

code/game/gamemodes/objective_items.dm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
excludefromjob = list("Head Of Security")
4040

4141
/datum/objective_item/steal/handtele
42-
name = "a hand teleporter."
42+
name = "a portal gun."
4343
targetitem = /obj/item/hand_tele
4444
difficulty = 5
4545
excludefromjob = list("Captain", "Research Director")

code/game/objects/effects/portals.dm

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,10 @@
5555
/// Atmos link destination
5656
var/turf/open/atmos_destination
5757

58+
/obj/effect/portal/tele
59+
icon_state = "portal2"
60+
desc = "I don't know captain! This seems a bit u-u-unstable!"
61+
5862
/obj/effect/portal/anom
5963
name = "wormhole"
6064
icon = 'icons/obj/objects.dmi'

code/game/objects/items/teleportation.dm

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -118,10 +118,10 @@
118118
* Hand-tele
119119
*/
120120
/obj/item/hand_tele
121-
name = "hand tele"
122-
desc = "A portable item using blue-space technology."
121+
name = "Portal Gun"
122+
desc = "You know the worst part about inventing teleportation? Suddenly, you're able to travel the whole galaxy, and the first thing you learn is, you're the last guy to invent teleportation."
123123
icon = 'icons/obj/device.dmi'
124-
icon_state = "hand_tele"
124+
icon_state = "portal_gun"
125125
item_state = "electronic"
126126
lefthand_file = 'icons/mob/inhands/misc/devices_lefthand.dmi'
127127
righthand_file = 'icons/mob/inhands/misc/devices_righthand.dmi'
@@ -232,7 +232,7 @@
232232
to_chat(user, span_notice("\The [src] is malfunctioning."))
233233
return
234234
user.show_message(span_notice("Locked In."), MSG_AUDIBLE)
235-
var/list/obj/effect/portal/created = create_portal_pair(current_location, get_teleport_turf(get_turf(T)), src, 300, 1, null, atmos_link_override)
235+
var/list/obj/effect/portal/created = create_portal_pair(current_location, get_teleport_turf(get_turf(T)), src, 300, 1, /obj/effect/portal/tele, atmos_link_override)
236236
if(!(LAZYLEN(created) == 2))
237237
return
238238
try_move_adjacent(created[1])

icons/obj/device.dmi

-4.3 KB
Binary file not shown.

icons/obj/stationobjs.dmi

-2.51 KB
Binary file not shown.

0 commit comments

Comments
 (0)