shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Tg 1 28 sync testing/confirmation (#5178)

Browse Source 
* maps, tgui, tools

* defines and helpers

* onclick and controllers

* datums

fucking caught that hulk reversal too.

* game and shuttle modular

* module/admin

* oh god they fucking moved antag shit again

* haaaaate. Haaaaaaaaaate.

* enables moff wings

* more modules things

* tgstation.dme

before I forget something important

* some mob stuff

* s'more mob/living stuff

* some carbon stuff

* ayy lmaos and kitchen meat

* Human stuff

* species things

moff wings have a 'none' version too

* the rest of the module stuff.

* some strings

* misc

* mob icons

* some other icons.

* It compiles FUCK BORERS

FUCK BORERS
This commit is contained in:
Poojawa
2018-01-29 04:42:29 -06:00
committed by GitHub
parent 89fa4b0f28
commit 03086dfa91
666 changed files with 27177 additions and 35945 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/ruins/objects_and_mobs/sin_ruins.dm
+3 -3
View File
@@ -12,9 +12,9 @@
/obj/structure/cursed_slot_machine/attack_hand(mob/living/carbon/human/user)
if(!istype(user))
return
if(in_use)
if(obj_flags & IN_USE)
return
in_use = TRUE
obj_flags |= IN_USE
user.adjustCloneLoss(20)
if(user.stat)
to_chat(user, "<span class='userdanger'>No... just one more try...</span>")
@@ -28,7 +28,7 @@
/obj/structure/cursed_slot_machine/proc/determine_victor(mob/living/user)
icon_state = "slots1"
in_use = FALSE
obj_flags &= ~IN_USE
if(prob(win_prob))
playsound(src, 'sound/lavaland/cursed_slot_machine_jackpot.ogg', 50, 0)
new/obj/structure/cursed_money(get_turf(src))
code/modules/ruins/spaceruin_code/caravanambush.dm
+139
View File
@@ -25,3 +25,142 @@
desc = "A prototype of a new crowbar design, allegedly the red color scheme makes it go faster."
name = "experimental crowbar"
toolspeed = 0.3
/obj/machinery/computer/shuttle/caravan
/obj/item/circuitboard/computer/caravan
build_path = /obj/machinery/computer/shuttle/caravan
/obj/item/circuitboard/computer/caravan/trade1
build_path = /obj/machinery/computer/shuttle/caravan/trade1
/obj/item/circuitboard/computer/caravan/pirate
build_path = /obj/machinery/computer/shuttle/caravan/pirate
/obj/item/circuitboard/computer/caravan/syndicate1
build_path = /obj/machinery/computer/shuttle/caravan/syndicate1
/obj/item/circuitboard/computer/caravan/syndicate2
build_path = /obj/machinery/computer/shuttle/caravan/syndicate2
/obj/item/circuitboard/computer/caravan/syndicate3
build_path = /obj/machinery/computer/shuttle/caravan/syndicate3
/obj/machinery/computer/shuttle/caravan/trade1
name = "Small Freighter Shuttle Console"
desc = "Used to control the Small Freighter."
circuit = /obj/item/circuitboard/computer/caravan/trade1
shuttleId = "caravantrade1"
possible_destinations = "whiteship_away;whiteship_home;whiteship_z4;whiteship_lavaland;caravantrade1_custom;caravantrade1_ambush"
/obj/machinery/computer/camera_advanced/shuttle_docker/caravan/trade1
name = "Small Freighter Navigation Computer"
desc = "Used to designate a precise transit location for the Small Freighter."
shuttleId = "caravantrade1"
lock_override = NONE
shuttlePortId = "caravantrade1_custom"
shuttlePortName = "Custom Location"
jumpto_ports = list("whiteship_away" = 1, "whiteship_home" = 1, "whiteship_z4" = 1, "caravantrade1_ambush" = 1)
view_range = 14
x_offset = -5
y_offset = -5
designate_time = 100
/obj/machinery/computer/shuttle/caravan/pirate
name = "Pirate Cutter Shuttle Console"
desc = "Used to control the Pirate Cutter."
icon_screen = "syndishuttle"
icon_keyboard = "syndie_key"
light_color = LIGHT_COLOR_RED
circuit = /obj/item/circuitboard/computer/caravan/pirate
shuttleId = "caravanpirate"
possible_destinations = "caravanpirate_custom;caravanpirate_ambush"
/obj/machinery/computer/camera_advanced/shuttle_docker/caravan/pirate
name = "Pirate Cutter Navigation Computer"
desc = "Used to designate a precise transit location for the Pirate Cutter."
icon_screen = "syndishuttle"
icon_keyboard = "syndie_key"
shuttleId = "caravanpirate"
lock_override = NONE
shuttlePortId = "caravanpirate_custom"
shuttlePortName = "Custom Location"
jumpto_ports = list("caravanpirate_ambush" = 1)
view_range = 14
x_offset = 3
y_offset = -6
/obj/machinery/computer/shuttle/caravan/syndicate1
name = "Syndicate Fighter Shuttle Console"
desc = "Used to control the Syndicate Fighter."
icon_screen = "syndishuttle"
icon_keyboard = "syndie_key"
light_color = LIGHT_COLOR_RED
req_access = list(ACCESS_SYNDICATE)
circuit = /obj/item/circuitboard/computer/caravan/syndicate1
shuttleId = "caravansyndicate1"
possible_destinations = "caravansyndicate1_custom;caravansyndicate1_ambush;caravansyndicate1_listeningpost"
/obj/machinery/computer/camera_advanced/shuttle_docker/caravan/syndicate1
name = "Syndicate Fighter Navigation Computer"
desc = "Used to designate a precise transit location for the Syndicate Fighter."
icon_screen = "syndishuttle"
icon_keyboard = "syndie_key"
shuttleId = "caravansyndicate1"
lock_override = NONE
shuttlePortId = "caravansyndicate1_custom"
shuttlePortName = "Custom Location"
jumpto_ports = list("caravansyndicate1_ambush" = 1, "caravansyndicate1_listeningpost" = 1)
view_range = 7
x_offset = 2
y_offset = 0
/obj/machinery/computer/shuttle/caravan/syndicate2
name = "Syndicate Fighter Shuttle Console"
desc = "Used to control the Syndicate Fighter."
icon_screen = "syndishuttle"
icon_keyboard = "syndie_key"
req_access = list(ACCESS_SYNDICATE)
light_color = LIGHT_COLOR_RED
circuit = /obj/item/circuitboard/computer/caravan/syndicate2
shuttleId = "caravansyndicate2"
possible_destinations = "caravansyndicate2_custom;caravansyndicate2_ambush;caravansyndicate1_listeningpost"
/obj/machinery/computer/camera_advanced/shuttle_docker/caravan/syndicate2
name = "Syndicate Fighter Navigation Computer"
desc = "Used to designate a precise transit location for the Syndicate Fighter."
icon_screen = "syndishuttle"
icon_keyboard = "syndie_key"
shuttleId = "caravansyndicate2"
lock_override = NONE
shuttlePortId = "caravansyndicate2_custom"
shuttlePortName = "Custom Location"
jumpto_ports = list("caravansyndicate2_ambush" = 1, "caravansyndicate1_listeningpost" = 1)
view_range = 7
x_offset = 0
y_offset = 2
/obj/machinery/computer/shuttle/caravan/syndicate3
name = "Syndicate Drop Ship Console"
desc = "Used to control the Syndicate Drop Ship."
icon_screen = "syndishuttle"
icon_keyboard = "syndie_key"
req_access = list(ACCESS_SYNDICATE)
light_color = LIGHT_COLOR_RED
circuit = /obj/item/circuitboard/computer/caravan/syndicate3
shuttleId = "caravansyndicate3"
possible_destinations = "caravansyndicate3_custom;caravansyndicate3_ambush;caravansyndicate3_listeningpost"
/obj/machinery/computer/camera_advanced/shuttle_docker/caravan/syndicate3
name = "Syndicate Drop Ship Navigation Computer"
desc = "Used to designate a precise transit location for the Syndicate Drop Ship."
icon_screen = "syndishuttle"
icon_keyboard = "syndie_key"
shuttleId = "caravansyndicate3"
lock_override = NONE
shuttlePortId = "caravansyndicate3_custom"
shuttlePortName = "Custom Location"
jumpto_ports = list("caravansyndicate3_ambush" = 1, "caravansyndicate3_listeningpost" = 1)
view_range = 10
x_offset = -1
y_offset = -3