Commit Graph

8831 Commits

Author SHA1 Message Date
Chinsky c0ce1bef8e SHUT UP VENDOMAT NO I DO NOT WANT THAT CANDY BAR 2013-02-06 01:01:57 +04:00
Chinsky 55479a7b99 'Only in effect if can_hold is not set' my ass.
Fixed belts stil not accepting batons and tasers.
2013-02-06 00:49:44 +04:00
Chinsky db5b00cd61 Quick fix for mods not being able to access CA from some places 2013-02-05 17:17:39 +04:00
Chinsky e68dcce602 Msay and adminhelps now go to admins and mods. 2013-02-05 16:44:15 +04:00
Chinsky fdb2bd0e76 Fixes issues with stool grabbing.
Stool children no longer can be taken in hand like papa stool.
Hate this class structure.
2013-02-05 15:53:53 +04:00
Chinsky 7528570b1b Added verb to toggle deadchat to everyone who can hear it.
Mods now can ghostjump again.
2013-02-05 15:51:07 +04:00
Chinsky 5a23ec6485 Fixed asay being visible to moderators. 2013-02-03 00:50:39 +04:00
Chinsky f4469083b2 Made permission checks for some verbs more TG-compliant.
Fixed Edit Appearance verb.
Removed DB verb since we are not using SQL and it'll only confuse admins.
2013-02-03 00:10:29 +04:00
Chinsky e74cd95fec Merge branch 'master' of https://github.com/Baystation12/Baystation12
Conflicts:
	code/game/turfs/turf.dm
	code/modules/clothing/spacesuits/rig.dm
2013-02-02 23:10:12 +04:00
Chinsky 16bea39176 Fix for #2226, Camera runtimes.
Also now cameras on 2.1.0.1 is TG compliant!
2013-02-02 22:46:24 +04:00
Chinsky c944fd92c2 ported fix for #2051 from master 2013-02-02 22:23:10 +04:00
Chinsky f553a66553 Fixed two hairstyles having same name. 2013-02-02 22:16:38 +04:00
Chinsky c4997a34f1 Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12
Conflicts:
	code/modules/mob/new_player/new_player.dm
	code/modules/reagents/Chemistry-Reagents.dm
	code/modules/reagents/Chemistry-Recipes.dm
2013-02-02 20:00:10 +04:00
Chinsky 2023253cac Fixes newly built plating repressurizing rooms. 2013-02-02 19:16:16 +04:00
Chinsky bc340028be Made atmos suit fire-resistant again and handled slowdown changes in a less clutery way. 2013-02-01 20:30:58 +04:00
Cael_Aislinn 06809c3651 Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into bleeding-edge-freeze
Conflicts:
	code/controllers/master_controller.dm
	code/modules/mob/new_player/sprite_accessories.dm
	code/modules/reagents/Chemistry-Reagents.dm
	code/setup.dm
	icons/mob/human_face.dmi

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2013-02-01 23:45:13 +10:00
Cael_Aislinn b310da9bb9 Merge branch 'master' of https://github.com/Baystation12/Baystation12 into bleeding-edge-freeze
Conflicts:
	code/modules/mob/new_player/new_player.dm
	code/modules/mob/new_player/sprite_accessories.dm
	code/modules/reagents/Chemistry-Reagents.dm
	code/modules/reagents/Chemistry-Recipes.dm
	code/setup.dm
	html/changelog.html
	icons/mob/human_face.dmi

also a sneaky issue resolution caused in spiky taj hair

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2013-02-01 23:25:45 +10:00
Cael_Aislinn 05bd27d777 re-enabled air profiling, some tweaks to turf changes to resolve outstanding issues (will be overwritten by master)
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2013-02-01 23:07:28 +10:00
Cael_Aislinn b2dc822744 tweaked fire to lower fuel/oxy requirements, increase temperature rise, made it a bit easier to get fires working
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2013-02-01 23:06:40 +10:00
Cael_Aislinn 5767a87d93 increased threshold for wind sound to play
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2013-02-01 23:03:07 +10:00
Cael_Aislinn a6ae09bccf fix for some zas runtimes, overrepressurisation after sealing breaches, zones not properly restructuring during some breaches
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2013-02-01 22:50:34 +10:00
Cael_Aislinn ae16d81888 fix for blueprint areas randomly disappearing after a while, blueprint areas power not working, blueprint areas lighting being [initially] borked
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2013-02-01 22:49:24 +10:00
Cael_Aislinn 2d15506667 removed extraneous rig slowdowns
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2013-02-01 22:46:24 +10:00
Cael_Aislinn 6743f09ef2 Merge branch 'master' of https://github.com/Baystation12/Baystation12 2013-02-01 13:57:27 +10:00
cib e9d7b5ce0d Missing part of tajaran ear commit. 2013-01-31 20:04:22 +01:00
cib ae454a4f73 Doubled metabolism rates.
This puts metabolism back between where it was originally, and where the metabolism rebalance put it. Thus it shouldn't break anything, but it'll make most chemicals a bit more usable.
2013-01-31 18:12:09 +01:00
cib 4a39d9b53b Fixes for gamebreaking metabolism rates
- A single chili doesn't kill anymore
- Chloral hydrate no longer kills in amounts of 2 units
2013-01-31 18:04:51 +01:00
cib e54e44d495 Merge branch 'bleeding-edge-freeze' of github.com:Baystation12/Baystation12 into feature
Conflicts:
	code/game/gamemodes/events.dm
2013-01-31 11:15:32 +01:00
cib 9691e497b1 Event code fixes.
- Previously base event chance would get applied twice, so instead of e.g. 0.03 chance, a 0.03^2 chance
- Removed unused code
2013-01-31 11:03:48 +01:00
Chinsky 3e153c074c Replaced courtroom with meeting room. 2013-01-30 19:15:49 +04:00
Chinsky 24cf3c2dd0 Merge branch 'master' of https://github.com/Baystation12/Baystation12
Conflicts:
	code/datums/supplypacks.dm
	code/modules/clothing/spacesuits/rig.dm
	code/modules/mob/new_player/new_player.dm
	code/modules/reagents/Chemistry-Reagents.dm
	code/modules/reagents/Chemistry-Recipes.dm
	icons/mob/suit.dmi
	icons/obj/drinks.dmi
2013-01-30 16:39:00 +04:00
Cael_Aislinn 01eeef048f Merge branch 'master' of https://github.com/Baystation12/Baystation12 2013-01-30 13:13:37 +10:00
Chinsky 566ef61c23 Made blood type selectable in preferences again. 2013-01-30 01:31:37 +04:00
Chinsky 0bcda84eeb Fixed issue with magical wooden table disassembling.
Generally cleaned up table code.
2013-01-30 01:31:06 +04:00
cib f8ca13262c Fix issue #2193 2013-01-29 18:07:18 +01:00
RavingManiac b121235cf8 Pepper spray blindness and eye blurriness durations quintupled. Condensed capsaicin recipe added (capsaicin + plasma catalyst). 2013-01-29 18:12:42 +08:00
Chinsky fcb10b05d5 Should fix injured icons not updated. 2013-01-28 21:51:05 +04:00
Chinsky d1972efbb8 Can order contraband crates.
Moved most of 'contraband' out of crate to others.
2013-01-28 18:07:34 +04:00
Chinsky 5185dd988e Surgery runtime checks. 2013-01-28 01:51:42 +04:00
Chinsky 0c260c2c17 Added rejuv verb and setting OOC event info. 2013-01-28 01:28:30 +04:00
Chinsky 39a6b54a5a Added admins some verbs that flithy mods were hogging. 2013-01-28 01:25:52 +04:00
Chinsky 458726fd88 Now rest of admin ranks will at least have OOC. 2013-01-28 01:22:58 +04:00
Cael_Aislinn fb2eb8008e resolved supply_pack runtime, added stuff to contraband pack to make it not-empty, added icon for absinthe
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2013-01-25 16:26:19 +10:00
Cael_Aislinn 3c06edc689 resolved lying sprite issue for atmos hardsuits, hair being hidden behind atmos hardsuit helmets, normalised a bunch of values across hardsuits (slowdown, mainly) 2013-01-25 11:48:17 +10:00
Chinsky 5498ec206a Fixed air controller not advancing. 2013-01-24 21:30:27 +04:00
Chinsky dda55a02bc Blood now goes to vessels again. 2013-01-24 17:14:36 +04:00
Chinsky 3ceaa7e4d8 Nerfed environmental robusting a bit 2013-01-24 14:49:15 +04:00
Chinsky ebc6529b68 Fixed appendicitis killing people in 4 minutes.
Also from stage 2 and on, symptoms of lower stages can appear too.
2013-01-24 14:48:40 +04:00
Cael_Aislinn e7c10c44cd made delay round end work after restart timer has started, made delay verb also delay round end
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2013-01-24 15:38:23 +10:00
Chinsky 7f5e8bf595 Return of Moderator III: This is Getting Old.
Fixed mods back in, should have all powers they did.
Mod panel is MIA< let them use same admins use, can't do shit without having rights anyway.
2013-01-23 06:27:31 +04:00