Commit Graph

5545 Commits

Author SHA1 Message Date
cib
65b8eafe8e Added internal organs.
They can be hurt by their parent organ getting hurt.

Ruptured lungs are now represented as damage to the lungs internal organ.
2013-03-04 12:19:12 +01:00
Zuhayr
6c15bb5bfa Forgot to update the emag code so that the bots explode. 2013-03-04 04:14:44 -08:00
Zuhayr
810c9bea70 Added verbs to spiderbot, tweaked access. 2013-03-04 03:26:52 -08:00
Christian Bielert
65ff5dc7f9 Merge pull request #2460 from Gamerofthegame/bleeding-edge-freeze
Medical hardsuit changes
2013-03-01 16:07:00 -08:00
Christian Bielert
a211b493c8 Merge pull request #2465 from Zuhayr/bleeding-edge-freeze
Spiderbots and a bunch of commits from master.
2013-03-01 16:05:17 -08:00
Zuhayr
3774b16839 Made spiderbots buildable, animated spiderbot sprites. 2013-03-02 02:15:39 -08:00
Zuhayr
ad47e954ce Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 2013-03-01 23:15:19 -08:00
Zuhayr
e17038636f Added spiderbots! Adminspawn only currently. They take an occupied MMI or posibrain, can crawl through vents and hide, shock people, and go 'beep'. 2013-03-01 14:28:58 -08:00
Jim "Apples"
2064f57dc0 Merge pull request #2464 from caelaislinn/bleeding-edge-freeze
added an admin proc to check for any inactive players with custom items
2013-03-01 07:22:21 -08:00
Zuhayr
15984f6a14 Fix for posibrains, modification to posibrain brainmob for admin use, updated posibrain sprites, addition of spiderbot sprites for a later project. 2013-03-01 01:38:32 -08:00
Cael_Aislinn
30a34bbc9f added an admin proc to check for any inactive players with custom items
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2013-03-01 19:15:27 +10:00
Spamcat
c9e657a4c6 Reloading spent casings in the revolver doesn't duplicate "This one is spent" message
Fixed #2434.
2013-02-28 17:07:20 +04:00
Spamcat
9894ce73d5 Merge branch 'bleeding-edge-freeze' of github.com:Baystation12/Baystation12 into bleeding-edge-freeze 2013-02-28 13:48:44 +04:00
Spamcat
c4c31fd657 You can now switch off cameras.
Fixes #2394.
2013-02-28 13:46:56 +04:00
Gamerofthegame
a2cfc456c0 Removes Medical's random slowdown and faulty coding. 2013-02-27 22:07:30 -05:00
Gamerofthegame
f3ba4e4ec6 Opens the ERT debug-command preset for actual use. 2013-02-26 21:25:48 -05:00
RavingManiac
e84d739fac Condensed capsaicin effects increased to pre-merge levels. 2013-02-26 12:58:44 +08:00
Christian Bielert
80b9257332 Merge pull request #2446 from Baystation12/BEF-staging
Bef staging
2013-02-25 09:58:25 -08:00
Chinsky
b143022084 Merge pull request #2445 from CIB/feature
Fixed anti-depressants
2013-02-25 09:44:18 -08:00
cib
19e176e2ff Fixed paroxetine. 2013-02-25 18:40:42 +01:00
cib
f2f2ce12ea Fixed citalopram. 2013-02-25 18:39:20 +01:00
Cael_Aislinn
cfa3916b95 new events (pda spam, trivial and mundane news items, lotto, hacker)
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2013-02-26 03:02:24 +10:00
Chinsky
97b547d5d3 Merge pull request #2440 from Zuhayr/master
Robot changes, Set Flavour verb.
2013-02-25 01:19:08 -08:00
Zuhayr
36038d150c Returned Set Flavour Text to humans, added Set Pose and Set Flavour Text to robots. 2013-02-25 20:05:33 -08:00
Zuhayr
2381aa2dca Rename of cyborgs to robots (in strings), addition of robot spawn name-choosing proc, addition of method for removing robot brain. 2013-02-25 19:48:00 -08:00
Cael_Aislinn
54fd829781 fixed chemical prep not working (runtime)
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2013-02-25 15:06:40 +10:00
Cael_Aislinn
46ecf43cf9 Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into xenoarch
Conflicts:
	baystation12.dme
	code/WorkInProgress/Cael_Aislinn/ShieldGen/energy_field.dm
	icons/obj/device.dmi

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2013-02-25 14:40:46 +10:00
Cael_Aislinn
9b8387ac05 Merge branch 'master' of https://github.com/Baystation12/Baystation12 into xenoarch
Conflicts:
	baystation12.dme
	code/modules/reagents/Chemistry-Recipes.dm
	code/modules/research/xenoarchaeology/misc.dm

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2013-02-25 14:27:44 +10:00
Cael_Aislinn
09dc10810f Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into bleeding-edge-freeze 2013-02-25 14:02:55 +10:00
Cael_Aislinn
fad9909b78 mice dont wander when asleep, they also snuffle (snore) occasionally
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2013-02-25 13:45:38 +10:00
Cael_Aislinn
fed198964f fixed ooc runtime, removed random space in adminpms, removed forced disabling of stat tracking >.>
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2013-02-25 13:45:13 +10:00
cib
721f15fb07 Fix issue #2433
This should fix events not spawning.
2013-02-24 20:39:36 +01:00
cib
975407edb4 Forgot antidepressants file. 2013-02-24 17:37:34 +01:00
Chinsky
83fdf57540 Merge branch 'feature' of https://github.com/CIB/Baystation12 into cibderp
Conflicts:
	maps/tgstation.2.1.0.0.1.dmm
2013-02-24 20:29:59 +04:00
cib
b98eedeadf Added psychiatrist job and anti-depressants. 2013-02-23 05:36:04 +01:00
Chinsky
fd2f37428b Made limb surgery not EXPLODE robotic limbs 2013-02-23 03:58:32 +04:00
Chinsky
1aafb9ade9 Derp, forgot the surgery. 2013-02-23 02:30:01 +04:00
Chinsky
3b95009189 Commented out debug verb just in case.
Does not really affect anything, but may get a bit resource heavy if spammed.
2013-02-23 00:45:54 +04:00
Chinsky
039de3df1a Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into bleeding-edge-freeze 2013-02-23 00:12:26 +04:00
Chinsky
170c90b511 Merge pull request #2407 from caelaislinn/bleeding-edge-freeze
fixed compile error
2013-02-22 12:09:59 -08:00
Chinsky
2ce64b77a7 Merge branch 'necrosis' into bleeding-edge-freeze 2013-02-22 23:46:54 +04:00
Chinsky
1d1cea12ad Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into bleeding-edge-freeze
Conflicts:
	code/modules/events/infestation.dm
2013-02-22 23:46:41 +04:00
Chinsky
a8fdc16729 Debug verb to check how long it would take for gangrene to kick in. 2013-02-22 23:13:22 +04:00
Chinsky
f50fd49032 Gangrene!
Now germ level for organ has three thresholds.
LEVEL 1: Occasional (prob(10) every tick) tox damage and germ level raise.
LEVEL 2: In addition to that, tox damage and germ level raise every tick.
LEVEL 3: Limb necrosis. Currently does nothing but icon change. Also at this stage germs start leaking to connected organs, so amputations is necessary.
2013-02-22 23:12:27 +04:00
Chinsky
e8f8138e04 Added priority system for surgery steps.
Steps with higher priority would be attempted first.

Added preparation step for item insertion surgery.
2013-02-22 23:06:37 +04:00
Cael_Aislinn
a5a8caeb00 fixed compile error
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2013-02-23 02:30:32 +10:00
Christian Bielert
4b7f5c817c Merge pull request #2403 from caelaislinn/bleeding-edge-freeze
Miscellaneous minor things
2013-02-22 07:38:39 -08:00
Cael_Aislinn
3c3d19ade8 added missing config links, added holder rights check to hearing deadchat
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2013-02-23 01:31:52 +10:00
Chinsky
cc3d49cf4b Merge pull request #2401 from caelaislinn/bleeding-edge-freeze
RUST updates, event tweaks, shielding updates
2013-02-22 07:05:11 -08:00
Cael_Aislinn
43e58aacbb new unathi hair styles
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2013-02-23 00:46:33 +10:00