Commit Graph

40933 Commits

Author SHA1 Message Date
Tacolizard 46620139ac cattle rustler 2017-07-09 15:10:14 -07:00
Joan Lung ec9439b915 Renames GLOB.cardinal to GLOB.cardinals to match GLOB.diagonals and GLOB.alldirs 2017-07-09 17:24:28 -04:00
ShizCalev 40aa9ce8ce Switches SM squawk to report integrity (#29084) 2017-07-09 11:14:05 -04:00
Jordan Brown 1e173f96c6 Fixes wrapping objects (#29125) 2017-07-09 11:13:15 -04:00
Joan Lung 9e3e8e9df6 Fixes entire stacks of goliath plates being used on mechs (#29127) 2017-07-09 08:44:27 -03:00
kevinz000 248cf95273 Update flashbang.dm (#29136) 2017-07-09 08:43:43 -03:00
kevinz000 b3a5e27369 Update hypospray.dm (#29139) 2017-07-09 08:43:18 -03:00
MrStonedOne 85de154132 astar improvements
also brought astar back up to specs, gave pathnode better vars
2017-07-09 00:27:39 -07:00
RandomMarine 4b9ba464ce return of the return 2017-07-08 16:18:49 -07:00
Joan Lung db503ace11 boss 2017-07-08 18:29:59 -04:00
kevinz000 5e80b018eb Update vending_items.dm 2017-07-08 13:57:10 -07:00
Xhuis c7d28736ec Curse mobs are now immune to chasms 2017-07-08 15:00:06 -04:00
Leo 65ca7de2be Merge pull request #29123 from Xhuis/catching_refactor
Refactors catching to use attack_hand
2017-07-08 15:18:42 -03:00
Leo 6ee0e7d8ce Merge pull request #29120 from Cyberboss/ahelpfix
Fixes repeated adminhelp message
2017-07-08 15:18:13 -03:00
Joan Lung 24f69f814b missed these 2017-07-08 14:09:07 -04:00
Joan Lung 1feb0021a1 Removes now-unnecessary obj_integrity definitions 2017-07-08 14:02:50 -04:00
MoreRobustThanYou b96bc440db Fixes plasma glass merging with normal glass (#29114)
* Fixes plasma glass merging with normal glass

* Update window.dm

* Update smelting_designs.dm
2017-07-08 10:44:32 -04:00
Jordan Brown e89408c15e Merge pull request #29112 from MoreRobustThanYou/patch-4
Reinforced Plasma Glass is more SME-worthy
2017-07-08 10:43:57 -04:00
Ashe Higgs 1cb25f514c Chasm code cleanup (#29106)
* Chasm cleanup

* Ports to associative lists

* returning to my roots

* FALSE
2017-07-08 10:43:40 -04:00
Jordan Brown 54f46ca1a0 Merge pull request #29097 from KorPhaeron/lex
New portable generator icons
2017-07-07 23:28:00 -04:00
RandomMarine d173597660 gives drones harm intent 2017-07-07 19:34:40 -07:00
Kyle Spier-Swenson eeab8f71bb Make timer debug info more robust (#29100)
* Make timer debug info more robust

* Update timer.dm

* Update timer.dm

* Update timer.dm

* Update timer.dm

* Update timer.dm

* Update timer.dm

* Update timer.dm
2017-07-07 22:18:44 -04:00
Joan Lung bbdfed3c2a Dreams while sleeping are now slightly longer on average and will contain more possibilities (#29104)
* Dreams while sleeping are now slightly longer on average and will contain more possibilities

* I don't think this is worth it at all but sure whatever

* are you dreaming too

* dream
2017-07-07 22:17:57 -04:00
Jordan Brown c9e1f2a42f Kor's a butt 2017-07-07 20:44:41 -04:00
Ergovisavi 796063c910 Adding the mook/wanderer mob for planetstation (#29046)
* Adding the mook/wanderer mob for planetstation

* Adds the two .ogg's for the mook mob

* mook fixes

* Mook fixes

* more fixes for mook

* Makes the mook's slash combo do an animation instead of just retaining the same pose

* reh
2017-07-07 15:15:31 -04:00
MoreRobustThanYou 6c31809bf0 Update window.dm 2017-07-07 15:11:53 -04:00
MoreRobustThanYou cdde74d82b Update window.dm 2017-07-07 14:16:03 -04:00
kevinz000 44e99ed7ba Adds Headphones! (#28993)
* kek

* this /should/ work.

* icon updates and wardrobes and vendors

* remie

* Update ears.dm

* typecast

* states

* updates

* Update fitness.dm

* Update wardrobe.dm

* Update vending.dm
2017-07-07 13:44:21 -04:00
Jordan Brown 4553bc8109 Merge pull request #29090 from ShizCalev/sm-alarm-sounds
Adds alarm sounds to SM
2017-07-07 13:18:04 -04:00
Ashe Higgs b057e19ec0 Adds collapsing stone tiles (#29042)
* Adds collapsing tiles

* Adds the 'falling' variable

* adds checking for kosms

* Changes, chasm works now

* VERY fast tile falling at incredible hihg speed

* stuff!

* removes a weird define

* FALSE
2017-07-07 13:17:37 -04:00
Xhuis 9a04270bc8 Refactors catching 2017-07-07 12:42:20 -04:00
Jordan Brown 55c2c2af7f Fixes repeated adminhelp message 2017-07-07 11:36:59 -04:00
Jordan Brown f4203ba88d Merge pull request #29088 from Really-Good-Soda-Flavor/marTIALARTS
Makes martial arts not be deleted
2017-07-07 10:38:44 -04:00
Leo a1d829126f Merge pull request #29076 from Cyberboss/LOCK_IT_DOWN
Fixes permissions elevation exploit
2017-07-07 11:37:28 -03:00
Jordan Brown b1f76269b4 Fixes permissions elevation exploit 2017-07-07 10:29:14 -04:00
Jordan Brown e74ba17b96 Merge pull request #29080 from ShizCalev/sm-attack-tweaks
Removed silicon SM interact message
2017-07-07 10:23:04 -04:00
Leo f36a2d5fc0 Merge pull request #29083 from kevinz000/patch-239
De-lags sandbox a bit
2017-07-07 11:21:16 -03:00
Jordan Brown 6c8b13dd67 Merge pull request #29095 from ChangelingRain/windowfix
Windows now have the proper starting health
2017-07-07 10:02:47 -04:00
Jordan Brown 8abc1877ff Merge pull request #29085 from ShizCalev/sm-rounding
Changes SM integrity rounding
2017-07-07 09:52:56 -04:00
Jordan Brown c1e3ac82ec Merge pull request #29081 from Fox-McCloud/reflect-refactor
Minor Projectile Reflection Refactor
2017-07-07 09:52:45 -04:00
MoreRobustThanYou f97f0afa7f Update window.dm 2017-07-07 09:18:54 -04:00
MoreRobustThanYou 289567a2f1 Update window.dm 2017-07-07 08:30:04 -04:00
MoreRobustThanYou 70f1f9a40d Update window.dm 2017-07-07 08:22:33 -04:00
MoreRobustThanYou 30c00659a9 Update window.dm 2017-07-07 07:56:23 -04:00
MoreRobustThanYou c172578fda Ups the intergrity of reinforced plasma windows
They need to be SME-worthy
2017-07-07 07:48:55 -04:00
oranges b825ca1545 Machine subsystem now checks qdel status (#29073)
If an item is qdeleted, it is not queued for processing and removed
from the processing list (if it's not already gone)

This will prevent machines getting processed when qdeleted (due to being
cached in the subsystem current run list)
2017-07-06 22:46:38 -05:00
oranges 5fba57358b Minor code clean up in magnet controller (#29074) 2017-07-06 22:43:31 -05:00
oranges 97fa94e9c6 Fix incorrect call to do_attack_animation (#29072)
This was causing a runtime as 1 is not a valid parameter
2017-07-06 22:41:39 -05:00
Leo 61af168b9e Merge pull request #29071 from tgstation/Cyberboss-patch-2
Fixes world.internet_address in irc check
2017-07-06 22:55:51 -03:00
kevinz000 0ad378a7bb Actually fixes wormhole jaunters, and no it was not my fault. (#28998) 2017-07-06 22:15:35 -03:00