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

compile fixes + initial map port

Browse Source
This commit is contained in:
Poojawa
2018-04-23 03:37:10 -05:00
parent 1c9175a9a8
commit 0d5d992732
38 changed files with 12148 additions and 9721 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modular_citadel/code/datums/uplink_items_cit.dm
-2
View File
@@ -128,8 +128,6 @@
throw_speed = 2
throw_range = 4
w_class = WEIGHT_CLASS_BULKY
max_w_class = WEIGHT_CLASS_NORMAL
max_combined_w_class = 21
attack_verb = list("bashed", "battered", "bludgeoned", "thrashed", "whacked")
resistance_flags = FLAMMABLE
max_integrity = 150
modular_citadel/code/game/machinery/cryopod.dm
+4 -4
View File
@@ -173,8 +173,8 @@
find_control_computer()
return ..()
/obj/machinery/cryopod/proc/find_control_computer(urgent = 0)
for(var/obj/machinery/computer/cryopod/C in area_contents(get_area(src)))
/obj/machinery/cryopod/proc/find_control_computer(urgent = 0,area/A)
for(var/obj/machinery/computer/cryopod/C in A)
control_computer = C
break
@@ -417,7 +417,7 @@
if(!Adjacent(user))
return
if(target == user)
visible_message("[user] starts climbing into the cryo pod.")
else
@@ -426,7 +426,7 @@
if(occupant)
to_chat(user, "<span class='boldnotice'>\The [src] is in use.</span>")
return
close_machine(target)
to_chat(target, "<span class='boldnotice'>If you ghost, log out or close your client now, your character will shortly be permanently removed from the round.</span>")
modular_citadel/code/game/machinery/wishgranter.dm
+1 -1
View File
@@ -38,7 +38,7 @@
to_chat(user, "[powah] materializes into your hands!")
else
to_chat(user, "[powah] materializes onto the floor.")
var/obj/machinery/power/supermatter_shard/powerwish = new /obj/machinery/power/supermatter_shard(loc)
var/obj/machinery/power/supermatter_crystal/powerwish = new /obj/machinery/power/supermatter_crystal(loc)
powerwish.damage = 700 //right at the emergency threshold
powerwish.produces_gas = FALSE
charges--
modular_citadel/code/game/objects/items/storage/firstaid.dm
+16 -7
View File
@@ -39,9 +39,14 @@
throw_range = 7
var/empty = FALSE
item_state = "firstaid"
w_class = WEIGHT_CLASS_SMALL
max_combined_w_class = 5 //half that of regular kits
storage_slots = 5
/obj/item/storage/hypospraykit/ComponentInitialize()
. = ..()
GET_COMPONENT(STR, /datum/component/storage)
STR.max_w_class = WEIGHT_CLASS_SMALL
STR.max_combined_w_class = 5
STR.max_items = 5
STR.cant_hold = typecacheof(list(/obj/item/disk/nuclear))
/obj/item/storage/hypospraykit/regular
icon_state = "firstaid-mini"
@@ -107,7 +112,6 @@
name = "combat hypospray kit"
desc = "A hypospray kit best suited for combat situations."
icon_state = "tactical-mini"
max_w_class = WEIGHT_CLASS_NORMAL
/obj/item/storage/hypospraykit/tactical/PopulateContents()
if(empty)
@@ -121,9 +125,14 @@
name = "deluxe hypospray kit"
desc = "A kit containing a Deluxe hypospray and Vials."
icon_state = "tactical-mini"
max_w_class = WEIGHT_CLASS_NORMAL
storage_slots = 6
max_combined_w_class = 6
/obj/item/storage/hypospraykit/cmo/ComponentInitialize()
. = ..()
GET_COMPONENT(STR, /datum/component/storage)
STR.max_w_class = WEIGHT_CLASS_SMALL
STR.max_combined_w_class = 6
STR.max_items = 6
STR.cant_hold = typecacheof(list(/obj/item/disk/nuclear))
/obj/item/storage/hypospraykit/cmo/PopulateContents()
if(empty)
modular_citadel/code/modules/custom_loadout/custom_items.dm
+9 -5
View File
@@ -316,13 +316,17 @@
icon_override = 'icons/mob/custom_w.dmi'
icon_state = "darksheath"
item_state = "darksheath"
storage_slots = 1
rustle_jimmies = FALSE
w_class = WEIGHT_CLASS_BULKY
max_w_class = WEIGHT_CLASS_BULKY
can_hold = list(
/obj/item/storage/belt/sabre/darksabre/ComponentInitialize()
. = ..()
GET_COMPONENT(STR, /datum/component/storage)
STR.max_items = 1
STR.rustle_sound = FALSE
STR.max_w_class = WEIGHT_CLASS_BULKY
STR.can_hold = typecacheof(list(
/obj/item/toy/sword/darksabre
)
))
/obj/item/clothing/neck/cloak/green
name = "Generic Green Cloak"
modular_citadel/code/modules/custom_loadout/load_to_mob.dm
+1 -1
View File
@@ -54,7 +54,7 @@
var/obj/item/loaded = loaded_atom
var/obj/item/storage/S = H.get_item_by_slot(slot_back)
if(istype(S))
S.handle_item_insertion(loaded, TRUE, H) //Force it into their backpack
S.SendSignal(COMSIG_TRY_STORAGE_INSERT,loaded, TRUE, H) //Force it into their backpack
continue
if(!H.put_in_hands(loaded)) //They don't have one/somehow that failed, put it in their hands
loaded.forceMove(T) //Guess we're just dumping it on the floor!
modular_citadel/code/modules/mob/living/silicon/robot/dogborg_equipment.dm
+8 -9
View File
@@ -158,16 +158,15 @@ SLEEPER CODE IS IN game/objects/items/devices/dogborg_sleeper.dm !
desc = "Fetch the thing!"
icon = 'icons/mob/dogborg.dmi'
icon_state = "dbag"
//Can hold one big item at a time. Drops contents on unequip.(see inventory.dm)
w_class = 5
max_w_class = 2
max_combined_w_class = 2
storage_slots = 1
collection_mode = 0
can_hold = list() // any
cant_hold = list(/obj/item/disk/nuclear)
w_class = WEIGHT_CLASS_BULKY
/obj/item/storage/bag/borgdelivery/ComponentInitialize()
. = ..()
GET_COMPONENT(STR, /datum/component/storage)
STR.max_w_class = WEIGHT_CLASS_BULKY
STR.max_combined_w_class = 5
STR.max_items = 1
STR.cant_hold = typecacheof(list(/obj/item/disk/nuclear))
//Tongue stuff
/obj/item/soap/tongue
modular_citadel/code/modules/vore/eating/digest_act_vr.dm
+1 -1
View File
@@ -5,7 +5,7 @@
// Ye default implementation.
/obj/item/proc/digest_act(var/atom/movable/item_storage = null)
for(var/obj/item/O in contents)
if(istype(O,/obj/item/storage/internal)) //Dump contents from dummy pockets.
if(istype(O,/obj/item/storage)) //Dump contents from dummy pockets.
for(var/obj/item/SO in O)
if(item_storage)
SO.forceMove(item_storage)