Cael Aislinn
f02e6fdd45
rework talking items and re-enable them, made xenoarch boxes have a variable internal size, added three new eldritch xenoarch finds (poltergeist mask, vampiric statuette, endless replenishing container)
...
Signed-off-by: Cael Aislinn <cael_aislinn@yahoo.com.au >
2014-06-20 18:42:25 +10:00
mwerezak
25e333a39b
Fixes #5186
2014-06-20 02:48:12 -04:00
Chinsky
6f6cf57a93
Merge pull request #5277 from Jarcolr/dev
...
Adds paths for therapy dolls from #2731
2014-06-20 09:02:03 +04:00
mwerezak
ffbad1ef15
Spaceacillin cures infected organs
2014-06-19 23:49:23 -04:00
mwerezak
82a85c2bae
Tweaks wound infection a bit
2014-06-19 23:48:49 -04:00
mwerezak
d512d62869
Re-enables organ infections, adds wound infection
2014-06-19 21:25:59 -04:00
mwerezak
9ef1216147
Updates l_move_time to use world.time
2014-06-19 18:11:39 -04:00
Hubblenaut
8a4739197e
Merge branch 'backup' into medical
2014-06-19 15:36:28 +02:00
Mloc
a00128c0ad
Merge pull request #5280 from comma/virus-racism
...
Diskette size change
2014-06-19 14:21:19 +01:00
Chinsky
f7e14c8f99
Merge pull request #5282 from Jarcolr/master
...
Partially fixes #5255 and walking over asteroid edges
2014-06-19 17:03:06 +04:00
Zuhayr
39acf41328
Merge pull request #5293 from mwerezak/armour
...
Allows armour to turn sharp attacks into blunt attacks with some probability
2014-06-19 21:08:39 +09:30
Zuhayr
21be85445e
Merge pull request #5303 from mwerezak/objectives
...
Fixes a missing config check in autotraitor.dm
2014-06-19 21:08:34 +09:30
Zuhayr
69d25ea048
Merge pull request #5301 from mwerezak/cargo-shuttle2
...
Docking Controllers Stage 3: Cargo Shuttle
2014-06-19 21:08:29 +09:30
Zuhayr
2a804244e3
Merge pull request #5279 from comma/guestid
...
Guest passes
2014-06-19 18:06:47 +09:30
Chinsky
0fbbd7f066
Merge pull request #5288 from laser50/patch-1
...
Returns ..() on Microwaves
2014-06-19 12:22:04 +04:00
Chinsky
b2337d0c51
Merge pull request #5289 from laser50/patch-2
...
Adds ..() on Chem Masters
2014-06-19 12:21:58 +04:00
Cael Aislinn
ad35bf3262
harvester can now harvest artifact's secondary effect, which effect it chooses is determined by which are active (if both are active it can harvest neither)
...
Signed-off-by: Cael Aislinn <cael_aislinn@yahoo.com.au >
2014-06-19 15:41:35 +10:00
mwerezak
cd971fb4ea
Fixes a missing config check in autotraitor
...
Also adds a config check to the various forge_* procs just to be sure.
2014-06-19 00:01:47 -04:00
Cael Aislinn
fc99c5b65f
miscellaneous fixes to various anomaly utiliser effects involving location/holder issues, fixed anomaly harvester runtime, reworks anomaly utiliser to be a lot easier/nicer to use, balance tweaks:
...
- caps stun effect values for pulsing
- sets max utiliser battery charge to 300 (30 sec)
- changes energy consumption for utiliser pulse effects to "effect max charge level" * "effect range" ^ 2
- changes energy consumption for utiliser touch effects to 100 (10 sec worth of consumption)
Signed-off-by: Cael Aislinn <cael_aislinn@yahoo.com.au >
2014-06-19 13:52:21 +10:00
mwerezak
c28fd0ecb5
Adds supply shuttle docking controllers
2014-06-18 21:25:17 -04:00
mwerezak
5006ebde14
Makes the supply shuttle process in a tighter loop
2014-06-18 21:24:57 -04:00
Cael Aislinn
f3ab8b0748
moved xenoarchaeology master controller code into a separate file
...
Signed-off-by: Cael Aislinn <cael_aislinn@yahoo.com.au >
2014-06-19 11:07:12 +10:00
Cael Aislinn
0e1c367012
reconstitutor has a chance to extract multiple genomes per fossil (50% for two genomes, 37.5% chance for three genomes), moved xenoarchaeology initialisation code into the master controller, added upper and lower spawn vals for digsite turf number and artifact machine number, added circuitboards for the reconstitutors, fixes missing clonepod for flora reconstitutors
...
Signed-off-by: Cael Aislinn <cael_aislinn@yahoo.com.au >
2014-06-19 11:06:20 +10:00
Cael Aislinn
6c46ceaf6d
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into xenoarchaeology
...
Conflicts:
icons/obj/hydroponics.dmi
manual merge of conflicted icon file
Signed-off-by: Cael Aislinn <cael_aislinn@yahoo.com.au >
2014-06-19 10:05:27 +10:00
mwerezak
e46c3c8834
Renames supply controller global var
...
Renamed from 'supply_shuttle' to 'supply_controller'
2014-06-18 19:37:46 -04:00
mwerezak
462593f0b5
Adds supply shuttle datum
2014-06-18 19:37:30 -04:00
Zuhayr
ce69599a3a
Whitelists diona nymphs. Forces them not to have universal_speak.
2014-06-19 08:48:58 +09:30
Zuhayr
8fa57539a5
Merge pull request #5295 from boopcat/happydrones
...
fixes
2014-06-19 08:23:13 +09:30
Hubblenaut
5e8a82bb0a
Fixes text color in advanced trauma kit surgery step
2014-06-18 23:11:01 +02:00
Hubblenaut
909c2d44a9
Removes medical belts from lockers
2014-06-18 22:35:56 +02:00
Chinsky
ded321d5c1
Nextgen lights #3 : Fire
...
Fire now emites colored light, pretty rad.
2014-06-19 00:16:19 +04:00
Chinsky
ceecd7abc9
Changed color mixing to use weighted average instead of addition. Should help against values reaching FF too fast.
...
Adjusted color mixing helper to use inbuilt procs.
2014-06-18 23:45:25 +04:00
Chinsky
9e3ad09b8c
Shortened helper.
...
Added new helper for alternative mixing.
2014-06-18 23:44:11 +04:00
Chinsky
2396c6d882
Nextgen lighting #2 : Lights
...
Can paint light tubes and bulbs with paint and stick in sockets to get colored lights.
2014-06-18 20:38:33 +04:00
Chinsky
fc73c8de22
Changes paint tile coloring to use color var, less icon procs.
2014-06-18 20:20:18 +04:00
Chinsky
a54d9cfd3b
Nextgen lights #1 : supermatter
...
Now it glows with yellowish tint, getting brighter as damage level rise.
2014-06-18 19:52:19 +04:00
mwerezak
37b71c81fb
Armour can turn sharp attacks into blunt ones
...
Kind of messy, but I couldn't find another way to do it without
reworking a lot of the mob defence procs.
2014-06-18 10:28:23 -04:00
mwerezak
5a3c7dc432
Fixes human/checkarmor getting the armour...
...
...value for the wrong body part.
Whoever put ran_zone() in there wasn't thinking straight, as it's not
going to affect the part that actually gets damaged.
2014-06-18 10:05:04 -04:00
mwerezak
2daab86c89
Fixes special shuttle consoles being...
...
...deconstructible
2014-06-18 09:37:30 -04:00
Boop
4b7a8610b8
Fix latex gloves box not having the right sprite
2014-06-18 13:32:10 +01:00
Boop
5b1949fb12
Fixes #5291 and another wound runtime
2014-06-18 12:44:08 +01:00
Boop
1b7acdb147
Fix runtime with brains and throwmode
2014-06-18 12:32:13 +01:00
Chinsky
cf53a4d6fb
Made lights look fancier with blend modes
2014-06-18 10:56:01 +04:00
Chinsky
f79e151ba7
Shortened helper procs a little.
2014-06-18 10:55:38 +04:00
mwerezak
0a394fb59f
Fixes tails not rendering on the player preview
2014-06-18 00:27:07 -04:00
mwerezak
83abddd8a8
Fixes tails not rendering in record photos
2014-06-18 00:26:02 -04:00
Wouter
580547f924
Adds ..() on Chem Masters
...
This makes sure they use power, and don't work when the power is out, beside making sure functions work correctly. As they didn't on my (adapted) code.
2014-06-18 03:46:31 +02:00
Wouter
2bc4c0e90f
Returns ..() on Microwaves
...
If you want this to use power, whatever asshat commented that out broke it.
Adapting my code, figured out that this was what broke it only days after trying to locate the issue, thinking it was related to my own code.
Probably quite minor, but this is what it is supposed to be functioning like. Right now it's just some powerless machine and whatever you do on /obj/machinery/New() is not working here without it.
2014-06-18 03:35:57 +02:00
Zuhayr
342bee81d4
Merge pull request #5284 from boopcat/happydrones
...
more fixes!
2014-06-18 08:58:00 +09:30
Boop
c7d745e9c1
fixed some weird slime runtime that's been around forever apparently
2014-06-17 23:30:25 +01:00
