Commit Graph

12118 Commits

Author SHA1 Message Date
monster860
d1a6f99183 Fixes permanent teleporters not being deconstructable 2016-05-28 08:10:19 -04:00
Fox-McCloud
027bcbc081 fix ups 2016-05-27 17:57:31 -04:00
Fox-McCloud
78437d5e46 Ports TG's Holy Weapons 2016-05-26 23:38:31 -04:00
Matt
182708c445 godhelpme 2016-05-26 22:26:38 +02:00
Matt
def7c93cd8 K 2016-05-26 22:07:31 +02:00
Matt
e158625bb8 Goddammit 2016-05-26 21:54:58 +02:00
VampyrBytes
df3b180af4 Merge remote-tracking branch 'refs/remotes/ParadiseSS13/master' into DatumEmotesMK2 2016-05-26 12:32:47 +01:00
Fox McCloud
64dbdc42db Merge pull request #4491 from IK3I/Sleeper-death-fix
Makes occupied machines not delete you when destroyed
2016-05-24 18:33:17 -04:00
Fox McCloud
d99d28584b Merge pull request #4493 from monster860/hrefs
Fix some href exploits
2016-05-24 18:32:06 -04:00
Tastyfish
7efe0beb94 Fixes a few runtimes 2016-05-23 19:23:18 -04:00
monster860
7d17a5f007 Damn it atom... 2016-05-23 17:22:13 -04:00
monster860
06783d1063 Cyborg console HREF exploit 2016-05-23 17:00:34 -04:00
monster860
70af06de0c Fix guest pass href exploit 2016-05-23 16:47:33 -04:00
monster860
fc47488d29 Fix gameboard href exploit and spacing issues 2016-05-23 16:47:20 -04:00
IK3I
ec9bc0ac2f Merge remote-tracking branch 'upstream/master' into Pod-Refactor 2016-05-23 14:59:23 -05:00
IK3I
454f5d755a Adds borg chargers to the list of fixed things
Also takes some code suggestions into account and clears up some edge
cases *cough*drones and diona*cough*
2016-05-23 14:33:55 -05:00
IK3I
3b29f033cb Fixes Body Scanner Issues
- no longer deletes you on deletion
- hostile mobs don't instantly lose sight of you upon jumping in one
2016-05-22 23:36:46 -05:00
IK3I
98c281e688 Makes sleepers not delete you when destroyed
fixes some player deletion scenarios and stops some recursive ex_act()
nonsense
2016-05-22 22:31:18 -05:00
Fox McCloud
82da2c7ce8 Merge pull request #4486 from Crazylemon64/taperecorder_enhancement
You can now wipe and rename tape recorder tapes
2016-05-22 21:26:28 -04:00
TheDZD
41738637f7 Merge pull request #4414 from CrAzYPiLoT-SS13/uselessness_at_its_best
Pilot's Useless Fiesta; Part 1: The hunting trip
2016-05-22 18:44:57 -04:00
Fox McCloud
0d273521ce Merge pull request #4432 from monster860/floorpainter
Adds the floor painter
2016-05-22 18:43:15 -04:00
TheDZD
6e2b236f81 Merge pull request #4480 from Fox-McCloud/simple-animal-loot-refactor
Simple Animal Loot Refactor
2016-05-22 18:31:43 -04:00
TheDZD
2e97cb8cd0 Merge pull request #4478 from DaveTheHeadcrab/SyringeIcons
Updates Syringe Icons
2016-05-22 16:32:47 -04:00
SamCroswell
1bf59c22ef Bows Down to Overlord DZD 2016-05-22 16:28:23 -04:00
Crazylemon64
b1990d4293 You can now wipe and rename tapes 2016-05-21 17:51:39 -07:00
Fox-McCloud
54b02d7ea0 Simple Animal Loot Refactor 2016-05-20 21:48: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
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
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