Aurorablade
ef5b2d7c8e
more things
2016-05-25 02:32:26 -04:00
Aurorablade
6ccb139696
weee
2016-05-23 18:41:39 -04:00
Aurorablade
ffb0201a25
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into BookClub
2016-05-21 21:59:29 -04:00
Fox McCloud
db4ae11b7f
Merge pull request #4469 from QuinnAggeler/swarmer-fix1
...
Stops swarmers from eating the PA or releasing the engine
2016-05-20 16:55:02 -04:00
HugoLuman
50a114116b
Removes unneeded else
2016-05-20 13:17:05 -07:00
Aurorablade
05346d1480
incoming shitode...
2016-05-20 00:48:09 -04:00
HugoLuman
fff7181da8
Reinforces the PA protection
...
Adds back in protection for obj/machinery/particle_accelerator and its children, since the PA console is still parented to it.
2016-05-19 17:37:14 -07:00
HugoLuman
e02222f11f
Check actually works now
...
Tested it. Hopefully that's the last commit needed.
2016-05-19 17:31:35 -07:00
Fox McCloud
3b30dae4a0
Merge pull request #4455 from razekpraxis/Paradise_LockClick
...
Adds a click sound when you lock a locker
2016-05-19 19:15:27 -04:00
HugoLuman
ee438cca12
Update swarmer.dm
2016-05-19 16:09:38 -07:00
HugoLuman
0e424a0efd
Finishes that check with a return at the end
2016-05-19 16:06:18 -07:00
Fox McCloud
dd8feb687b
Merge pull request #4451 from Tastyfish/is_mech
...
Makes is_mechanical() use OOP, removes bizarre chain procs
2016-05-19 19:06:05 -04:00
HugoLuman
3c66a76e0a
Adds a (!powered) check to field generators
...
Now they can eat the ones in storage but not the ones holding in the engine
2016-05-19 16:02:43 -07:00
HugoLuman
80cfaf0793
Fixes typepath of PA parent object
...
Corrects /obj/machinery/particle_accelerator/swarmer_act(
to /obj/structure/particle_accelerator/swarmer_act(
I'm guessing that whoever originally coded that missed the typepath and then added all the procs for the child objects because swarmers were still able to eat the PA
Now that it's fixed, the child checks should be unnecessary
2016-05-19 15:41:11 -07:00
HugoLuman
42305e9dee
Adds missing )
2016-05-19 14:16:11 -07:00
HugoLuman
44c4c23337
Stops swarmers from eating the PA or releasing the engine
...
Fixes the erroneous typepaths that protected two unused machinery objects instead of two actual parts of the PA
Stops swarmers from eating field generators. While it may have been intentional for them to eat the ones in secure storage, they could also eat the ones holding in the engine
Attempts to stop swarmers from accessing the engine (and depressurizing adjacent areas) in the first place. I believe the "no breach" only checking for space turfs (rather than airless plating) was an oversight, as it would allow them to causes breaches in other areas as well
2016-05-19 14:01:24 -07:00
TheDZD
ba62bc7539
Merge pull request #4465 from Fox-McCloud/cryo-fix
...
Fixes Cryopod Names
2016-05-19 16:39:09 -04:00
TheDZD
8956e0a8b2
Merge pull request #4464 from Fox-McCloud/tatorvamp-fix
...
Fixes TraitorVamp Chaplains
2016-05-19 16:38:56 -04:00
Fox-McCloud
ce47fed2d4
Fixes Cryopod Names
2016-05-19 09:46:08 -04:00
Fox-McCloud
986b65fcfa
Fixes TraitorVamp Chaplains
2016-05-19 02:34:38 -04:00
Razek
8efc712b71
fixed
2016-05-18 09:07:59 +01:00
Fox McCloud
bcbeb3024d
Merge pull request #4433 from monster860/permatele
...
Adds permanent teleporter
2016-05-17 22:26:18 -04:00
Fox McCloud
2174b5023e
Merge pull request #4452 from Tastyfish/tables
...
Fixes table stacking, refactors table parts
2016-05-17 22:02:13 -04:00
Aurorablade
d102a0b0b9
more VG stuff
2016-05-17 21:09:45 -04:00
Tastyfish
0a8cbadfd6
colonoscopy
2016-05-17 20:19:04 -04:00
Fox McCloud
fb16a64c9c
Merge pull request #4440 from tigercat2000/abductor_nanaggins
...
Abductor probing console human icon
2016-05-17 16:18:07 -04:00
Razek
9144289780
Adds a click sound when you lock a locker. (I was so bored.)
...
Signed-off-by: Razek <megamattman2234@hotmail.co.uk >
2016-05-17 18:02:39 +01:00
Tastyfish
d05fdccba4
Fixes table stacking, refactors table parts
2016-05-17 08:21:26 -04:00
Tastyfish
ef3859203b
Makes is_mechanical() use OOP, removes bizarre is_active()
2016-05-17 07:25:52 -04:00
Aurorablade
dc5a74f8f6
start of VG ports
2016-05-17 00:27:07 -04:00
TheDZD
cb5f572969
Merge pull request #4423 from Fox-McCloud/foam
...
Foam Fixes+Changes
2016-05-16 20:15:39 -04:00
Tigercat2000
cc8cfe8ab6
Abductor probing console human icon
...
fixes the lack of occupant icon on the probing console
2016-05-16 04:05:03 -07:00
Aurorablade
c3ee3192ba
last of tg tweaks for now.
...
rune blood dna is runtiming but eh....
2016-05-15 23:09:48 -04:00
monster860
3dcbe81b6b
adds return
2016-05-14 18:45:44 -04:00
monster860
63574226c6
spans
2016-05-14 18:26:58 -04:00
monster860
a7330745a2
Adds permanent teleporter
2016-05-14 18:09:47 -04:00
Aurorablade
ce69938a65
FAALLLLSSSEEEEEEEEEEEEE
2016-05-14 00:50:26 -04:00
AugRob
69c51878a5
Add screwdriver sound when opening airlock panels
2016-05-13 17:11:17 -05:00
Fox McCloud
3ee2e470a1
Merge pull request #4331 from KasparoVy/voxhair
...
Refactors Hair so it's on the Head + Adds a Vox Hairstyle + Fixes/Refactors Morph + Features to Morph and CMA...
2016-05-13 15:36:34 -04:00
Fox McCloud
9e65cd7564
Merge pull request #4231 from monster860/concurrency
...
Telecomms concurrency fix
2016-05-13 15:34:15 -04:00
Aurorablade
a44086c39a
FALSE HALP
2016-05-13 00:48:54 -04:00
Fox-McCloud
e22bc8a42b
Foam Fixes+Changes
2016-05-12 23:47:30 -04:00
TheDZD
117edefe02
Merge pull request #4422 from Tastyfish/runtimes-fix
...
Fixes a few runtimes
2016-05-12 20:52:59 -04:00
TheDZD
462f45f659
Merge pull request #4375 from monster860/windowrcd
...
Gives the RCD the ability to construct and deconstruct windows.
2016-05-12 19:35:51 -04:00
Tastyfish
b77541bc9b
Fixes a couple runtimes and weird add_reagents/add_reagents_list that was silly
2016-05-12 19:22:07 -04:00
monster860
53e52f24d4
lein nutes
2016-05-12 18:39:01 -04:00
Aurorablade
f99a8141c5
TG Ports and datum cult screwups 2
...
I may have missed something
2016-05-11 20:15:36 -04:00
Fox-McCloud
007c7ba8d3
Dumber
2016-05-11 19:12:26 -04:00
TheDZD
06eafc8a25
Merge pull request #4407 from Fox-McCloud/no-guns
...
Refactors Species Gun Handling
2016-05-10 22:46:52 -04:00
TheDZD
015af5519e
Merge pull request #4391 from Fox-McCloud/objectives
...
TG Traitor Objectives Assignment
2016-05-10 22:41:49 -04:00
Aurorablade