Commit Graph

36167 Commits

Author SHA1 Message Date
QualityVan a86f2fc252 Lets bayonets butcher, fixes bayoneting typo 2017-05-26 16:25:35 -04:00
Leo eea0dc085a Merge pull request #27661 from Cyberboss/patch-91
Fixes ex_act not having waitfor = FALSE
2017-05-26 15:21:24 -03:00
Leo d9550db98f Merge pull request #27667 from Cyberboss/patch-97
Fixes airlocks having two Initializes
2017-05-26 15:20:14 -03:00
Leo 96693de99a Merge pull request #27668 from Cyberboss/patch-98
Makes a thing use QDEL_NULL
2017-05-26 15:19:47 -03:00
Joan Lung 5387d795a8 Splits up mine_items.dmi (#27669) 2017-05-26 15:19:16 -03:00
Robustin bfea7b3a10 Fixes Gang War's infinity shuttle (#27675)
* Pointless commit so I can reopen

* Update gang.dm

* Update shuttle.dm

* Update emergency.dm

* Update recaller.dm

* Update gang.dm

* Update gang_datum.dm

* Update emergency.dm

* Update gang_datum.dm

* .len

* wew
2017-05-26 12:27:14 -04:00
FantasticFwoosh cadc52a033 Adds goliath cloak & a recipe (Lavaland PvE primitive item) (#27537) 2017-05-26 13:14:12 -03:00
kevinz000 882cd4ac46 Adds cycling delay to PKborg dampeners, fixes dampener projectors leaving fields behind when server is lagging (#27655) 2017-05-26 13:12:41 -03:00
Jordan Brown 69ece91a38 Moves attack chain proc from global to obj/item (#27659) 2017-05-26 13:11:43 -03:00
Joan Lung 843ee5f7c0 Merge pull request #27658 from AnturK/alright-i-give-up-ill-rewrite-this-tomorrow
Fixes adv camera leaving obscured images
2017-05-26 10:05:30 -04:00
kevinz000 d536bf6caf [READY] Adds ability to add bayonets to weapons - Only enabled on kinetic accelerators - refactors gunlight/bayonet sprites to ballistics too (#27416)
* hm

* separation part 1

* fixes and more fixes

* gunlight minirefactor

* refactor

* done
2017-05-26 10:37:10 +02:00
ShizCalev ec6185dbfd [Box] Maintenance Cleanup (#27645) 2017-05-25 22:38:16 -03:00
Leo 5d02d4b9d1 Merge pull request #27638 from Cyberboss/patch-96
Fixes monkeys having two Initializes and not returning a hint
2017-05-25 22:33:41 -03:00
Joan Lung c0a0947019 Refactors how diagonal smoothing underlays work (#27643) 2017-05-25 22:33:21 -03:00
Jordan Brown 7563e639a6 Makes a thing use QDEL_NULL 2017-05-25 14:37:30 -04:00
Jordan Brown 71845b2c25 Fixes airlocks having two Initializes 2017-05-25 14:36:37 -04:00
Jordan Brown 5af44a4441 Fixes ex_act sleeping 2017-05-25 13:49:29 -04:00
Joan Lung 9724a8f35a Merge pull request #27656 from 4dplanner/c4
c4 now takes 3 seconds instead of 5 to plant
2017-05-25 12:20:48 -04:00
Leo 193eb007ea Merge pull request #27631 from ChangelingRain/turretlayering
Turret bases will properly layer under turret covers
2017-05-25 12:37:37 -03:00
Leo 3d2aca11cd Merge pull request #27630 from ChangelingRain/plasmaray
Aux base plasma turrets now have range equal to the range they fire in
2017-05-25 12:37:04 -03:00
4dplanner 49f24ec3c6 Roughly one fifth of internal affairs agents are traitors with an extra objective (#27626) 2017-05-25 11:52:48 -03:00
Leo 2ecddb8db6 Merge pull request #27627 from Crexfu/master
Xenobio console origin tech fix
2017-05-25 11:44:19 -03:00
Leo 67d7a548b6 Merge pull request #27582 from Cyberboss/NukeDiskFix
[s] Fixes hiding the nuke disk on the arrivals shuttle
2017-05-25 11:43:21 -03:00
AnturK a716ed7869 Fixes adv camera leaving obscured images 2017-05-25 16:01:48 +02:00
Robustin 7443201bba Gang Icons and Fixes (#27593) 2017-05-25 10:45:20 -03:00
kevinz000 019fa55775 Properly makes ID console jobslot open/close delays a config option (#27606) 2017-05-25 10:38:03 -03:00
Leo 04cb10b31c Merge pull request #27624 from Cyberboss/patch-95
INDESTRUCTIBLE objects are no longer affected by explosions
2017-05-25 10:37:05 -03:00
Leo 8ff636066b Merge pull request #27625 from Cyberboss/Shrooms
Removes the shadowshroom admin message
2017-05-25 10:36:03 -03:00
4DPlanner 445ac6383d lol 2017-05-25 14:09:09 +01:00
kevinz000 8575bad94b fixes AOE projectile automatic proximity detonation (#27565)
* Update magic.dm

* Update magic.dm

* Update magic.dm

* Update magic.dm

* Update magic.dm
2017-05-25 14:28:49 +02:00
Robustin 4db0385ff1 4th Attempt at 60% shuttle recall gang murderbone thing (#27414)
Still very important, still a victim of Github memes.

Tried to push to Militairies version but it had like a million commits so fuck that. This accounts for Jordie0608's requested changes. The latest changes moves the "no recall" aspect to the emergency shuttle subsystem so now any future code can simply set SSshuttle.emergencyNoRecall to TRUE if they want to prevent recalls from taking place.

See #27228 for references to the last 3 PR's.

tweak: Gang mode now calls a 4 minute unrecallable shuttle once 60% of the crew is dead
2017-05-25 12:20:44 +12:00
Leo 4cb21f3f8b Merge pull request #27607 from Cruix/box_fix
Fixed some jobs not spawning with their box
2017-05-24 20:29:03 -03:00
4dplanner b2c2aa317b Crushers now actually mark (#27610) 2017-05-24 20:28:35 -03:00
Leo 2e6ae153c5 Merge pull request #27609 from Cyberboss/patch-88
Fixes SSlighting Recovery
2017-05-24 20:28:12 -03:00
QualityVan 5cc93872d1 Improves collector feedback (#27595) 2017-05-24 20:20:15 -03:00
Leo b14d10034e Merge pull request #27596 from ohnopigeons/plasmanerf
Nerfs plasma cost
2017-05-24 18:53:44 -03:00
Jordan Brown 7b3bc38351 Refactors explosions (#26361) 2017-05-24 18:44:08 -03:00
Joan Lung b3d1280dff Adds marker beacons to mining as a vendible item (#27589) 2017-05-24 18:31:44 -03:00
Leo e464497158 Merge pull request #27599 from QualityVan/zombiebrains
Brains extracted from infectious zombies keep their old species
2017-05-24 18:29:54 -03:00
Remie Richards da5b119e11 Dot Nonsense: find the current running proc's type! (#27601) 2017-05-24 18:29:13 -03:00
Joan Lung f7cb6c8484 Renames a var (#27578) 2017-05-24 18:20:27 -03:00
ShizCalev 3ce8b2922c More Map Cleanup (#27559) 2017-05-24 18:19:11 -03:00
Joan Lung 17f44707c2 Merge pull request #27586 from tgstation/lzimann-patch-1
Closes bold tag in bombing list secret
2017-05-24 17:18:06 -04:00
Leo ccd02cc054 Merge pull request #27587 from Cyberboss/patch-92
Adds a missing null check
2017-05-24 18:16:46 -03:00
Leo d139a6ff6a Merge pull request #27594 from Cyberboss/patch-94
Fixes DBCore Recovery
2017-05-24 18:16:23 -03:00
Leo f375c1f8f1 Merge pull request #27600 from ChangelingRain/cultfixes
Fixes clock cultists not getting their "objective"
2017-05-24 18:15:28 -03:00
Jordan Brown 195a67374d Fixes monkeys having two Initializes and not returning a hint 2017-05-24 15:39:24 -04:00
Joan Lung 97a5942b90 Turret bases will properly layer under turret covers 2017-05-24 11:54:40 -04:00
Joan Lung e062d8e289 Aux base plasma turrets now have range equal to the range they fire in 2017-05-24 11:44:00 -04:00
Crexfu 4a69f8af60 corrected spelling error 2017-05-24 10:04:20 -05:00