Iamgoofball
06719b5aa9
added a fuck ton of small changes
2013-11-19 23:00:07 -08:00
Nanai
160e0f9ee8
Poultice potency, bugfixes
...
Herbal poultice effectiveness now scales with potency of base herb.
2013-11-14 15:21:29 -05:00
Nanai
7ce2314c11
Merge Fixes
...
Fixes issues post merge and and with minor sanity checks and neatness.
2013-11-14 13:08:40 -05:00
Nanai
ae31f9cdcf
Surgery Update
...
Proper repair surgery for internal organs- Scalpel replaced by membranes from advanced kits, robotic hearts have a separate surgery.
2013-11-14 13:08:31 -05:00
Nanai
cba1a9585d
Medical Hoopery
...
Added eyes as an internal organ, removed the eye-stat var on mobs and changed it to properly direct it to eye damage. Altered all reference.
Updated the sleeper to allow for ejection of the beakers and occupants in panel.
Updated the body scanner to check for prosthetics/mechanized organs, and inform the individual of the blind disability.
Laid the groundwork for mechanical and assisted internal organs.
Groundwork for chemical: Peridaxon, a chemical that allows for the slow regeneration from organ damage.
2013-11-14 12:40:30 -05:00
Mloc-Argent
e6b44d0f35
Merge branch 'master' of github.com:Baystation12/Baystation12 into dev
2013-11-14 12:03:59 +00:00
Chinsky
8696d4fbd9
No nullname ID cards
2013-11-12 02:10:01 +03:00
DJSnapshot
7665a1a00e
Merge pull request #3895 from Baystation12/master
...
Merge Dev with Master
2013-11-07 16:31:43 -08:00
Chinsky
b7edb181ed
Where can I get my idiot certificate.
2013-11-05 03:59:39 +04:00
Chinsky
65c248cda0
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into miasma
2013-11-05 02:57:40 +04:00
Chinsky
fd928d4b5f
Cleaned the fuck out of smoke.
2013-11-05 02:57:23 +04:00
Chinsky
98ba7e4699
Fixes zombie goast tableflips
2013-11-04 22:36:22 +04:00
Mloc-Argent
f1b230edc4
Merge branch 'master' into dev
2013-11-04 10:46:13 +00:00
DJSnapshot
63fb3f29ea
mecha fixes
2013-11-02 12:26:34 -07:00
DJSnapshot
69389d392c
Fix for https://github.com/Baystation12/Baystation12/issues/3813
2013-11-02 11:45:26 -07:00
Iamgoofball
989c8b69c5
Fixed Copypasta again!
...
Fixed Copypasta again!
Fixed Copypasta again!
Fixed Copypasta again!
Fixed Copypasta again!
Fixed Copypasta again!
2013-11-02 11:36:14 -07:00
Iamgoofball
74b5a003cc
Fixed Copypasta!
...
Fixed Copypasta!
2013-11-02 11:17:17 -07:00
Iamgoofball
a75492d26b
Startoad's plasma windows commit, I'm doing the github stuff for it.
...
3677121b51
2013-11-01 18:53:45 -07:00
Cael Aislinn
a4e5bad409
fixes an overwritten fusion reaction, fixes typo on id computer, makes transit tubes traversible, makes conveyor switches access protected
...
Signed-off-by: Cael Aislinn <cael_aislinn@yahoo.com.au >
2013-10-29 05:10:17 +10:00
Nanai
adc563db05
Added in two new manuals by Magmaram for atmospherics and EVA.
2013-10-27 18:24:30 -04:00
Nanai
88ef9a3be2
Fixed the absent/removed sprite on experimental welding tools.
2013-10-27 18:24:04 -04:00
Segrain
858df5ca64
Fix for #3804 .
2013-10-24 19:16:54 +03:00
Segrain
6655ae9b11
Wallets and cards.
2013-10-21 05:10:33 +03:00
Segrain
8bd055357a
Same fix again.
2013-10-21 04:48:07 +03:00
Segrain
121b10b16c
Conflict fix.
2013-10-21 04:37:28 +03:00
Segrain
ace205b323
Code cleanup.
2013-10-18 08:40:45 +03:00
Segrain
183c44c4c8
Smallfix.
2013-10-18 08:38:14 +03:00
Chinsky
930a30cfd0
Moved stuff from /structure to /obj/structure because I am tired of accidently going inside of it for unused file and empty file
2013-10-16 12:51:30 +04:00
Chinsky
55ea60a785
Fixed derpy type of psych couch
2013-10-16 12:50:40 +04:00
Chinsky
f3028d3edd
Attempted fix #3769
...
Var is fine in one line, null in next one. Cannot feasibly prevent that without slapping nullcheck before EVERY mention on that var, so going to just add some sanity checks and call it a day
2013-10-16 11:28:41 +04:00
Segrain
21718c5bac
Fix for #3764 .
2013-10-13 03:44:43 +03:00
Mloc
1b9e5c81ea
Merge pull request #3756 from comma/tableflip
...
Tableflips & cover system
2013-10-11 11:36:31 -07:00
Chinsky
05bb07375e
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into coathanger
2013-10-11 22:22:08 +04:00
Chinsky
a18fbaac1d
Cover system.
...
Tables now give some cover from bullets and beams.
Standing behind the table gives you 20% chance of table taking the hit instead.
Flipped table gives +20%, but only if bullet comes from the side it faces. Otherwise no cover is provided at all.
Lying on the floor gives +20%.
Table takes half of damage human would, and breaks down after its health goes to zero.
Reinforced talbes have double the health, wooden ones - half.
2013-10-11 22:17:45 +04:00
Segrain
eb9a337d07
Merge remote-tracking branch 'upstream/master' into dev
2013-10-11 12:44:44 +03:00
Segrain
7ea98f6d79
Examining fix.
2013-10-11 10:19:58 +03:00
Chinsky
fadc121dac
Can flip weakened reinforced table now too.
2013-10-11 10:52:24 +04:00
Chinsky
c30693dfcf
Flipped tables now have 20% chance to take damage instead of whatever is behind them.
2013-10-11 02:48:41 +04:00
Chinsky
daba423428
Tableflips!
...
You can now flip non-reinforced straight, 1-tile wide tables.
Complete with ugly codersprites for flipped tables.
2013-10-11 02:13:59 +04:00
Chinsky
e1d2dd4aa1
Coat racks. Can hold either labcoat or detective coat.
2013-10-10 15:33:02 +04:00
Chinsky
b78141e413
Merge branch 'dev' into coathanger
2013-10-10 14:42:42 +04:00
Chinsky
7f62dfc5b1
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into dev
...
Conflicts:
code/_onclick/hud/alien.dm
code/_onclick/hud/alien_larva.dm
code/_onclick/hud/human.dm
code/_onclick/hud/monkey.dm
code/_onclick/hud/robot.dm
code/setup.dm
2013-10-10 14:30:34 +04:00
Chinsky
cf69a5797d
WIP coat rack
2013-10-10 13:49:42 +04:00
Chinsky
b96f9ef650
Merge pull request #3744 from Baystation12/dev-freeze
...
BYOND AKBAR
2013-10-10 02:45:45 -07:00
Chinsky
3c7c715e06
Merge pull request #3727 from fauxki/dev
...
Dev - Lightswitches for Medbay / Beach Holodeck Update
2013-10-08 21:23:42 -07:00
Mloc-Argent
65f218ee63
Merge branch 'master' into dev-freeze
...
Conflicts:
code/ZAS/Fire.dm
html/changelog.html
maps/tgstation2.dmm
Signed-off-by: Mloc-Argent <colmohici@gmail.com >
2013-10-08 22:01:16 +01:00
Mloc-Argent
a1f55a50b1
Massive click code rework by SuperSayu, ported from TG.
...
Full details at https://github.com/tgstation/-tg-station/pull/1206
Fixes #3648
Hopefully done right this time.
Signed-off-by: Mloc-Argent <colmohici@gmail.com >
2013-10-08 20:27:39 +01:00
Chinsky
7555dd0f0b
Merge branch 'master' into dev
...
Conflicts:
code/setup.dm
2013-10-08 15:16:57 +04:00
Mloc-Argent
3d2f92f92c
Made energy weapons not get a bloody overlay.
...
Signed-off-by: Mloc-Argent <colmohici@gmail.com >
2013-10-07 20:35:35 +01:00
Mloc-Argent
ebf2ba2d4a
Fixes.
...
Made glowshrooms and intercoms not use a ridiculous internal loop, and fixed a pickup luminosity bug with glowshrooms.
fixes #3708
Fixes #3718
Fixes #3702
Signed-off-by: Mloc-Argent <colmohici@gmail.com >
2013-10-07 20:35:26 +01:00
