diff --git a/code/modules/admin/admin.dm b/code/modules/admin/admin.dm index f38a9d2790b..5305be97577 100644 --- a/code/modules/admin/admin.dm +++ b/code/modules/admin/admin.dm @@ -1267,6 +1267,33 @@ var/global/BSACooldown = 0 else alert("You cannot perform this action. You must be of a higher administrative rank!") return + + if (href_list["granttaj"]) + if (src.level>=5) + var/mob/M = locate(href_list["granttaj"]) + for (var/s in alien_whitelist) + if(findtext(s,"[M.ckey] - Tajaran")) + alert("This key is already on the whitelist!", null, null, null, null, null) + return + alien_whitelist += "[M.ckey] - Tajaran" + usr << "[M.ckey] added to Tajaran whitelist." + else + alert("You cannot perform this action. You must be of a higher administrative rank!") + return + + if (href_list["grantsog"]) + if (src.level>=5) + var/mob/M = locate(href_list["grantsog"]) + for (var/s in alien_whitelist) + if(findtext(s,"[M.ckey] - Soghun")) + alert("This key is already on the whitelist!", null, null, null, null, null) + return + alien_whitelist += "[M.ckey] - Soghun" + usr << "[M.ckey] added to Soghun whitelist." + else + alert("You cannot perform this action. You must be of a higher administrative rank!") + return + /***************** BEFORE************** if (href_list["l_players"]) @@ -2473,6 +2500,8 @@ var/global/BSACooldown = 0 body += "Thunderdome 2 | " body += "Thunderdome Admin | " body += "Thunderdome Observer | " + body += "Grant Tajaran (Temp) | " + body += "Grant Soghun (Temp) | " body += "
" body += "" diff --git a/code/modules/chemical/Chemistry-Reagents.dm b/code/modules/chemical/Chemistry-Reagents.dm index 4ac979182f3..e7a1922ba14 100644 --- a/code/modules/chemical/Chemistry-Reagents.dm +++ b/code/modules/chemical/Chemistry-Reagents.dm @@ -1818,9 +1818,9 @@ datum M:confused += 2 M:drowsyness += 2 if(2 to 50) - M:sleeping += 1 + M:sleeping += 5 if(51 to INFINITY) - M:sleeping += 1 + M:sleeping += 5 M:adjustToxLoss(2) ..() return diff --git a/code/modules/customitems/item_defines.dm b/code/modules/customitems/item_defines.dm index d00a57f63c1..0d87b19a3dc 100644 --- a/code/modules/customitems/item_defines.dm +++ b/code/modules/customitems/item_defines.dm @@ -238,6 +238,13 @@ item_state = "olddressuniform" color = "olddressuniform" +/obj/item/clothing/under/rank/security/fluff/jeremy_wolf_1 //whitewolf41: Jeremy Wolf + name = "worn officer's uniform" + desc = "An old red security jumpsuit. Seems to have some slight modifications." + icon = 'custom_items.dmi' + icon_state = "jeremy_wolf_1" + color = "jeremy_wolf_1" + //////////// Masks //////////// /obj/item/clothing/mask/fluff/flagmask //searif: Tsiokeriio Tarbell diff --git a/code/modules/mob/living/carbon/human/life.dm b/code/modules/mob/living/carbon/human/life.dm index 73e78818d2c..9e92636e56e 100644 --- a/code/modules/mob/living/carbon/human/life.dm +++ b/code/modules/mob/living/carbon/human/life.dm @@ -915,6 +915,7 @@ var/blood_volume = round(vessel.get_reagent_amount("blood")) if(bloodloss) drip(bloodloss) +/* //Causing too many runtimes, sorry Sky. else if(blood_volume < 560 && blood_volume) var/datum/reagent/blood/B = locate() in vessel //Grab some blood if(!B.data["donor"] == src) //If it's not theirs, then we look for theirs @@ -924,6 +925,7 @@ break //At this point, we dun care which blood we are adding to, as long as they get more blood. B.volume = max(min(B.volume + 560/blood_volume,560), 0) //Less blood = More blood generated per tick +*/ if(!blood_volume) bloodloss = 0 else if(blood_volume > 448) @@ -959,18 +961,6 @@ if(getOxyLoss() > 50) Paralyse(3) - if(sleeping) - adjustHalLoss(-5) - if(paralysis <= 0) - Paralyse(2) - if (prob(10) && health && !hal_crit) spawn(0) emote("snore") - if(!src.sleeping_willingly) - src.sleeping-- - - if(resting) - if(weakened <= 0) - Weaken(2) - if(health < config.health_threshold_dead || brain_op_stage == 4.0) death() else if(health < config.health_threshold_crit) @@ -990,7 +980,6 @@ if (stunned > 0) AdjustStunned(-1) stat = 0 - if (weakened > 0) AdjustWeakened(-1) lying = 1 @@ -1282,7 +1271,9 @@ nutrition_icon.icon_state = "nutrition3" else nutrition_icon.icon_state = "nutrition4" + if (pressure) + if(istype(wear_suit, /obj/item/clothing/suit/space)||istype(wear_suit, /obj/item/clothing/suit/armor/captain)) pressure.icon_state = "pressure0" diff --git a/code/modules/mob/screen.dm b/code/modules/mob/screen.dm index 89d5bd10d5c..7bec0b2f96f 100644 --- a/code/modules/mob/screen.dm +++ b/code/modules/mob/screen.dm @@ -614,9 +614,14 @@ set category = "IC" if(usr.sleeping && usr.sleeping_willingly) + usr << "\blue You start to wake up..." usr.sleeping = 0 usr.sleeping_willingly = 0 + else if(usr.sleeping) + usr << "\red You feel unable to wake up..." + return else if(!usr.sleeping) + usr << "\blue You start to fall asleep..." usr.sleeping = 20 //Short nap usr.sleeping_willingly = 1 diff --git a/code/modules/projectiles/guns/projectile/shotgun.dm b/code/modules/projectiles/guns/projectile/shotgun.dm index 258be742952..72daf9dc61a 100644 --- a/code/modules/projectiles/guns/projectile/shotgun.dm +++ b/code/modules/projectiles/guns/projectile/shotgun.dm @@ -52,6 +52,7 @@ /obj/item/weapon/gun/projectile/shotgun/pump/combat name = "combat shotgun" icon_state = "cshotgun" + item_state = "cshotgun" max_shells = 8 origin_tech = "combat=5;materials=2" ammo_type = "/obj/item/ammo_casing/shotgun" @@ -120,6 +121,7 @@ return if(do_after(user, 30)) //SHIT IS STEALTHY EYYYYY icon_state = "sawnshotgun" + item_state = "sawnshotgun" w_class = 3.0 item_state = "gun" flags &= ~ONBACK //you can't sling it on your back diff --git a/config/alienwhitelist.txt b/config/alienwhitelist.txt index e69de29bb2d..5093c0711e5 100644 --- a/config/alienwhitelist.txt +++ b/config/alienwhitelist.txt @@ -0,0 +1,10 @@ +rawrtaicho - Tajaran +forsamori - Tajaran +jaffakaik - Tajaran +jaffakaik - Soghun +philphil123 - Tajaran +philphil123 - Soghun +searif - Soghun +searif - Tajaran +galenus - Soghun +botanistpower - Tajaran diff --git a/config/custom_items.txt b/config/custom_items.txt index c898877057a..acfd9e7942c 100644 --- a/config/custom_items.txt +++ b/config/custom_items.txt @@ -37,4 +37,5 @@ thebreadbocks: Steve Johnson: /obj/item/fluff/steve_johnson_1 themij: Taryn Kifer: /obj/item/clothing/head/helmet/greenbandana/fluff/taryn_kifer_1 tzefa: Wes Solari: /obj/item/fluff/wes_solari_1 vinceluk: Seth Sealis: /obj/item/clothing/suit/storage/det_suit/fluff/graycoat -whitellama: Ethan Way: /obj/item/fluff/ethan_way_1 \ No newline at end of file +whitellama: Ethan Way: /obj/item/fluff/ethan_way_1 +whitewolf41: Jeremy Wolf: /obj/item/clothing/under/rank/security/fluff/jeremy_wolf_1 \ No newline at end of file diff --git a/html/changelog.html b/html/changelog.html index 0661b1565d5..f66b8dd710b 100644 --- a/html/changelog.html +++ b/html/changelog.html @@ -36,7 +36,16 @@ Header Section - +Baystation 12 Credit List + + + + +
+ Code: Abi79, Aryn, Cael_Aislinn, Chinsky, cib, CompactNinja, DopeGhoti, Erthilo, Hawk_v3, Head, Ispil, Lexus Langg, Melonstorm, Master_of_Stuff, Miniature, Mloc, SkyMarshal, Spectre, Strumpetplaya, Sunfall, Tastyfish, Uristqwerty
 + Sprites: Apple_Master, Arcalane, Chinsky, CompactNinja, Deus Dactyl, Erthilo, Flashkirby, Miniature
 + Thanks To: /tg/ station devs, Goonstation devs, and the original Spacestation 13 devs. +
@@ -55,6 +64,9 @@ should be listed in the changelog upon commit though. Thanks. -->

Erthilo updated:

@@ -91,8 +103,7 @@ should be listed in the changelog upon commit though. Thanks. -->

Erthilo updated:

diff --git a/icons/mob/items_lefthand.dmi b/icons/mob/items_lefthand.dmi index 18e78d1b468..58982d49b64 100644 Binary files a/icons/mob/items_lefthand.dmi and b/icons/mob/items_lefthand.dmi differ diff --git a/icons/mob/items_righthand.dmi b/icons/mob/items_righthand.dmi index 24e77ab85c3..3cd258850ac 100644 Binary files a/icons/mob/items_righthand.dmi and b/icons/mob/items_righthand.dmi differ diff --git a/icons/mob/uniform.dmi b/icons/mob/uniform.dmi index 3bb0f47fe5c..1449da2447b 100644 Binary files a/icons/mob/uniform.dmi and b/icons/mob/uniform.dmi differ diff --git a/icons/obj/custom_items.dmi b/icons/obj/custom_items.dmi index 5c75a292afe..cf18853c68d 100644 Binary files a/icons/obj/custom_items.dmi and b/icons/obj/custom_items.dmi differ