Commit Graph

5103 Commits

Author SHA1 Message Date
Cael_Aislinn
2ef841da6e overhaul/cleanup to ano utilizers: they're now consistent with modern ss13 interactions + process more cleanly and operate more robustly, they properly interact with the rest of the updated xenoarch content, activating them should also give a message to anyone watching
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2013-03-10 18:43:41 +10:00
Cael_Aislinn
50f4d3a24d harvester overhaul to be cleaner + updated interaction and processing, should properly interact with the rest of the xenoarch update, draining charge is now done incrementally and procs the artifact effect on the harvester/anyone nearby
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2013-03-10 18:43:35 +10:00
Cael_Aislinn
ade8fcae22 effects will get a random id if the excavation code doesn't assign them one, cleaned up local activation feedback for effects
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2013-03-10 18:33:11 +10:00
Cael_Aislinn
28ab7d4e90 players touching an artifact with gloves will now receive a feedback message
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2013-03-10 18:32:06 +10:00
Cael_Aislinn
88c17b75b6 tweaks to artifact analysis including non-sfx vocal feedback, some cleanups to pre-scan checks
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2013-03-10 18:31:30 +10:00
Cael_Aislinn
fdcbebab93 tweaks and fixes to a bunch of artifact effects
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2013-03-10 18:21:45 +10:00
Cael_Aislinn
46761b14f8 fleshed out artifact analysis, added effect types to all the effects
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2013-03-10 14:55:04 +10:00
Cael_Aislinn
e27d7b2aeb cleanup for a bunch of stuff in arty scanners+harvesters, fix compile errors 2013-03-06 21:05:57 +10:00
Cael_Aislinn
dc794f5dac renamed a bunch of files to be a little more visible, added the beginnings of the new artifact scanners
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2013-03-06 20:50:17 +10:00
Cael_Aislinn
0481c1eb3f reagent data is properly preserved over chemical reactions
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2013-03-06 19:49:57 +10:00
Cael_Aislinn
53793fc2aa 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/storage.dmi

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2013-03-06 19:03:18 +10:00
Christian Bielert
f6efab34e0 Merge pull request #2479 from caelaislinn/bleeding-edge-freeze
RUST updates, other
2013-03-06 00:56:20 -08:00
Nanodesu
104cc5585d roro to slime fix 2013-03-06 05:59:21 +04:00
Cael_Aislinn
72ecd516c5 dropped grid check duration
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2013-03-06 01:45:26 +10:00
Cael_Aislinn
92517638bc removed double announcement for grid checks
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2013-03-06 01:31:40 +10:00
Cael_Aislinn
c5f461e90d circulators and type 1 gens are now rotateable/moveable, also made the operation of gens/circs much more generalised to allow for greater flexibility in setup (this makes type 2 gens incompatible with the circs, but i'll update them later)
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2013-03-06 01:28:57 +10:00
Cael_Aislinn
2933069ebe Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into bleeding-edge-freeze
Conflicts:
	html/changelog.html

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2013-03-05 17:23:16 +10:00
Cael_Aislinn
6f9542cd10 removed debug output for type 2 TEGs
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2013-03-05 17:06:43 +10:00
Cael_Aislinn
e511bf954e fixed icon + useability + construction issues for misc rust components, removed debug output for TEGs, made injectors no longer directwired
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2013-03-05 16:23:59 +10:00
cib
b25a6cb9bb Typofix 2013-03-05 04:25:21 +01:00
cib
aa4deb2b89 Merge branch 'bleeding-edge-freeze' of github.com:Baystation12/Baystation12 into feature 2013-03-04 12:20:38 +01:00
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