Commit Graph

21721 Commits

Author SHA1 Message Date
Ashe Higgs 8776c15703 Supermatter code cleanup (#29103)
* Simple animals are now properly disintegrated

* Now it's a cleanup PR!

* sanity check me out

* praise the webeditor!
2017-07-09 20:59:48 -04:00
kevinz000 9cf4ab3233 Fixes race condition with admin proc calls and load admins (#29143)
* Update admin_ranks.dm

* Update admin_ranks.dm

* Update admin_ranks.dm

* Update admin_ranks.dm
2017-07-09 20:48:15 -04:00
Jordan Brown bd9c7c5d03 Merge pull request #29134 from RandomMarine/trynottobreaklaw2
Allows drones to switch to/from harm intent
2017-07-09 20:44:24 -04:00
Jordan Brown 4a2545c371 Merge pull request #29141 from Xhuis/curse_mob_fix
Necropolis curse mobs no longer fall into chasms
2017-07-09 20:44:07 -04:00
Jordan Brown d4e5cfd5a3 Merge pull request #29140 from ChangelingRain/integrity
Removes now-unnecessary obj_integrity definitions
2017-07-09 20:43:44 -04:00
ShizCalev 40aa9ce8ce Switches SM squawk to report integrity (#29084) 2017-07-09 11:14:05 -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 b3a5e27369 Update hypospray.dm (#29139) 2017-07-09 08:43:18 -03:00
RandomMarine 4b9ba464ce return of the return 2017-07-08 16:18:49 -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 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
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
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
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
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
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
Leo a43ba99207 Merge pull request #29061 from ChangelingRain/warpeffect
Warp cubes are slightly less instant but way cooler
2017-07-06 22:12:21 -03:00
Leo 0f7dff1a19 Merge pull request #29068 from ShizCalev/lowercase
Lowercased computer names
2017-07-06 22:09:11 -03:00
Jordan Brown 7324244459 Doubles goonchat scroll snap tolerance (#29056) 2017-07-06 20:19:34 -04:00
KorPhaeron c478796ee9 New portgen icons 2017-07-06 20:10:58 -04:00
Fox-McCloud 46b16513e2 it's truly false 2017-07-06 16:13:22 -04:00
Shadowlight213 68102aaa0c Refactors speech/communication logging and adds coordinates to speech logs (#28997)
* Adds locations to speech and related communications
Refactors how logging is handled for these.

* changes

* ahhhhh

* preemptive merge conflict undoing maybe?

* Let's not delay this further
2017-07-06 16:06:43 -04:00
shizcalev 44066d2258 Switch instead 2017-07-06 14:09:00 -04:00
shizcalev 9eafe2f28e changed playsound to src 2017-07-06 13:56:10 -04:00
shizcalev 1166b6ccc4 Adds alarm sounds to SM 2017-07-06 13:39:00 -04:00
shizcalev 12d70973f0 Correction 2017-07-06 12:12:04 -04:00
Joan Lung bea7bf9297 Adds Necropolis curses for cursed items in Necropolis ruins (#28992)
* Adds Necropolis curses for cursed items in Necropolis ruins

* Adds sounds credit @FuryMcFlurry

* stat tweak

* these are painful enough

* a bit stronger

* i kind of wish there was a version of get_ranged_target_turf() that worked off of angle.... but there isn't

* smart coder 2000

* bossed around
2017-07-06 11:14:26 -04:00
Supermichael777 79c01530fb Makes pulsing the AI wire of a borg offer the user the option to change it and properly notifies the AI when it is cut. (#28877)
* Hopefully I didnt fuckup massivly

* I hope this works

* adds a disconect mesage

* adds disconnect message

* im a newb

* by request
2017-07-06 10:52:50 -04:00
Leo 585dee03af Merge pull request #29052 from Shadowlight213/Fredomneverslowsdown
Increases freedom of the freedom suit
2017-07-06 11:45:33 -03:00
Ashe Higgs 5f79b40bcd Cleans up posibrain code (#29008)
* Cleans up posibrain code

* Tweaks at maintainer request

* I'm soorryyyyy!

* then uninformed they shall be!
2017-07-06 10:43:05 -04:00
Jordan Brown ec0f0ca7c7 Merge pull request #29032 from ChangelingRain/minertweak
Tweaks the blood-drunk miner
2017-07-06 10:39:35 -04:00
Jordan Brown e9b7e30663 Merge pull request #28942 from Xhuis/uproot_fix
Fixes being unable to dig plants out of soil
2017-07-06 10:14:35 -04:00
kevinz000 01e39d19fd Replaces all instances of spawn() with addtimer/INVOKE_ASYNC (#28958)
* spawn removal

* missed a rp

* missed a var

* vars

* stuff

* ok

* Update disposal-unit.dm

* Update disposal-structures.dm

* Update tooltip.dm

* Update experimentor.dm

* Update disposal-unit.dm

* Update experimentor.dm
2017-07-06 10:13:44 -04:00