Commit Graph

2361 Commits

Author SHA1 Message Date
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
Mloc
cad798adad Merge pull request #2187 from CIB/BEF-premerge
Merge pre-tg-merge BEF
2013-01-15 13:29:59 -08:00
GauHelldragon
17317e3ff6 Fixes closets and destructive analyzer
You can no longer load your robot modules into these. Fixes #2138
2013-01-03 16:08:46 -08:00
Cael_Aislinn
e43e96d296 removed exploit where syndicate ids could make players untargettable
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2013-01-03 14:38:59 +10:00
cib
39b12b280a Fixed a few problems with PDA crew manifest. 2012-12-24 21:13:29 +01:00
cib
6da98a0c00 Everyone now has crew manifest, and it uses the good version on PDA's. 2012-12-24 20:50:20 +01:00
cib
026bbfa3b7 Implemented ghetto surgery tools. 2012-12-24 18:25:02 +01:00
Hawk-v3
aa9207ba44 Merge pull request #2102 from Ravensdale/master
Station-wide boom sound
2012-12-23 06:00:41 -08:00
Ravensdale
6a359474cc Update code/game/objects/explosion.dm
Removing a repeat if statement
2012-12-22 14:58:01 -08:00
Ravensdale
9d9061180d Port of z-level explosion sound effect from pre-merge. Tested and confirmed working with c-4, welding tanks, meteors and roro explosions, probably more! 2012-12-22 14:46:44 -08:00
Hawk-v3
70b40dfc6b Merge pull request #2096 from comma/crates
Crates
2012-12-22 08:29:21 -08:00
Chinsky
581f2c4db5 Merge branch 'master' into crates 2012-12-21 01:03:20 +04:00
cib
1d0147c396 Merge branch 'master' of github.com:Baystation12/Baystation12 into feature 2012-12-19 19:40:28 +01:00
Zuhayr
24473bdd19 A small fix to the throwing string when a mob is struck with a baton. 2012-12-19 01:57:47 -08:00
cib
679c715482 Merge branch 'master' of github.com:Baystation12/Baystation12 into minor_feature 2012-12-16 14:57:54 +01:00
cib
a6d5a6a26e Removed yet another type of gib that looks like a head.
Just how many heads does a person have, according to this code?
2012-12-16 04:40:19 +01:00
cib
0855c5d1af Fixes issue #2006
Medical belt can now hold autoinjector.
2012-12-16 04:04:43 +01:00
cib
9c4a48ffe5 Gibbing now creates actual limbs instead of decals.
Especially useful for the head, but also pretty nice in that you can now pick the limbs up and mail them to security.
2012-12-16 03:25:26 +01:00
cib
173236acf0 Merge branch 'master' of github.com:Baystation12/Baystation12 2012-12-09 17:22:43 +04:00
cib
ecb12fb4db Merge branch 'master' of git://github.com/comma/Baystation12 2012-12-06 16:50:28 +04:00
Jim "Apples"
84bcc87e45 Merge pull request #2027 from SweeperM/master
Fixes to lighting
2012-12-03 03:09:02 -08:00
Chinsky
f0ac799952 Merge branch 'bandages' 2012-12-02 21:17:11 +04:00
cib
bce8c4cfee Merge github.com:Baystation12/Baystation12 2012-12-02 13:36:10 +01:00
Chinsky
507dc0c496 Better feedback messages and ability to target groin, hands and feet. 2012-12-02 16:30:24 +04:00
Cael_Aislinn
2f7baa26f8 antiqua fixes: tvalve, barsigns, doctor's wardrobe, high volume pump, engine areas, moving parts sign, various other areas
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2012-12-01 17:49:34 +10:00
Chinsky
85c2af3871 Started cleanup of medical stacks code.
Removed silly way to get targeted organ.
Removed child organs being affected sometimes.
2012-12-01 09:04:20 +04:00
Chinsky
2e2c1e8c4c Merge branch 'master' into crates 2012-12-01 07:14:31 +04:00
SweeperM
b8a12b0b52 Fixes to lighting
-Fixed #2005 (for sure!)
-Fixed the stacking of brightness. Now the most bright item turned ON will be the one where the user gets its luminosity of.
-Cleaned the code a bit. Now only one var controls the on/off switch of light, and another holds the value of brightness when on.
2012-11-29 23:01:51 +00:00
cib
e11bab8ed7 Balancing emergency air tanks.
- Reduced volume by 33%, since testing revealed they currently last nearly 10 minutes
- Made *everyone* spawn with emergency air tanks, as opposed to random jobs like lawyer etc.
2012-11-28 02:32:04 +01:00
RavingManiac
f4fe11fc4c Merge branch 'master' of https://github.com/Baystation12/Baystation12 2012-11-24 01:26:19 +08:00
Chinsky
7150999fc6 Rolling pins now work not inly only in full moon at the odd day of week between 1 and 3 am if stars are right.
Fixes issue #1980
2012-11-21 22:29:46 +04:00
Chinsky
15abc757d3 Nullchecks. And one zero division. 2012-11-21 20:55:53 +04:00
RavingManiac
e31e117315 Package wrappers can now be put inside backpacks or other storage containers if the container is being held or worn. 2012-11-21 00:48:03 +08:00
SkyMarshal
0644ac9af0 Merge pull request #1974 from CIB/master
Medical fixes and balancing
2012-11-19 11:19:10 -08:00
cib
3a3f2ff4a1 Medical scanner additions.
- Stationary scanners detect vira.
- Portable scanners detect internal bleeding.
2012-11-18 16:38:29 +01:00
Ispil
ce0c2fc792 Fix to Issue #1961. Changes the Space Law book to link to the Baystation 12 wiki. Also changes the Engineering Textbook to link to the Baystation 12 wiki. 2012-11-17 12:16:02 -07:00
Chinsky
7a516a4cf8 Can fix limbs with welders again. And attack mobs with welders at all.
Fixes #1886
2012-11-15 18:04:03 +04:00
Chinsky
3f0eb4836f Ported some crate types frpm pre-merge.
Moved posters to arts crate and lipstick with cigs to party crate.
Contraband crate now has killer tomato seeds, illegal booze and drugs.
2012-11-15 17:17:56 +04:00
Hawk-v3
317e40795a Merge pull request #1939 from CIB/master
Misc stuff
2012-11-14 10:29:57 -08:00
cib
0491390edc Corrected the blood warning levels in medical scanner. 2012-11-14 18:13:04 +01:00
SkyMarshal
2fece529af Fixed a compile warning, reverted my grenade changes as requested by mangled, readded unsecuring-of-the-AI-with-a-wrench and the associated traitor objective checks, tweaked my previous commit re:adminhelps. 2012-11-13 22:46:43 -07:00
cib
422ec63bfc Merge branch 'master' of github.com:Baystation12/Baystation12
Conflicts:
	code/game/objects/items/devices/scanners.dm
	code/modules/mob/living/carbon/human/human.dm
2012-11-13 19:01:03 +01:00
cib
c7b8bda2af Merge branch 'master' of github.com:CIB/Baystation12 2012-11-13 17:14:58 +01:00
cib
3dc4a56554 Merge branch 'master' of github.com:Baystation12/Baystation12 2012-11-13 15:39:38 +01:00
CIB
74c5235c9d Added back the "unknown substance" message 2012-11-13 14:11:03 +01:00
Chinsky
8e60315b11 Merge branch 'master' of https://github.com/Baystation12/Baystation12
Conflicts:
	code/modules/mob/living/carbon/human/human.dm
2012-11-13 04:02:26 +04:00
Chinsky
bd20233c35 Added color coding to health analyzers, much like crew monitors.
Numbers for each damage will be written in corresponding color, bolded if above 50.
2012-11-13 01:56:31 +04:00
Ispil
814a670572 Fix to issue #1887. 2012-11-12 12:29:55 -07:00
cib
e92cecdefe Added basic germ code.
This will only trigger in surgery for now - That is when you cut someone open in surgery, you'd better wash your hands before, or otherwise you'll get infected wounds.
2012-11-12 12:51:28 +01:00
SkyMarshal
ecdb9ab118 Fixed the sillies marked with "skytodo". Removed ONESIZEFITSALL flag as we removed fatness, replaced it with PLASMAGUARD flag as that is what we were using the value as previously. Firedoors should no longer be derpy. The remaining "skytodo"s are places where I have no idea what the fuck you wanted or no idea what the fuck needed done with it. 2012-11-11 14:33:33 -07:00