65ca7de2be
Merge pull request #29123 from Xhuis/catching_refactor
...
Refactors catching to use attack_hand
2017-07-08 15:18:42 -03:00
6ee0e7d8ce
Merge pull request #29120 from Cyberboss/ahelpfix
...
Fixes repeated adminhelp message
2017-07-08 15:18:13 -03:00
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
e89408c15e
Merge pull request #29112 from MoreRobustThanYou/patch-4
...
Reinforced Plasma Glass is more SME-worthy
2017-07-08 10:43:57 -04:00
1cb25f514c
Chasm code cleanup ( #29106 )
...
* Chasm cleanup
* Ports to associative lists
* returning to my roots
* FALSE
2017-07-08 10:43:40 -04:00
54f46ca1a0
Merge pull request #29097 from KorPhaeron/lex
...
New portable generator icons
2017-07-07 23:28:00 -04:00
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
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
c9e1f2a42f
Kor's a butt
2017-07-07 20:44:41 -04:00
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
6c31809bf0
Update window.dm
2017-07-07 15:11:53 -04:00
cdde74d82b
Update window.dm
2017-07-07 14:16:03 -04:00
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
4553bc8109
Merge pull request #29090 from ShizCalev/sm-alarm-sounds
...
Adds alarm sounds to SM
2017-07-07 13:18:04 -04:00
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
9a04270bc8
Refactors catching
2017-07-07 12:42:20 -04:00
55c2c2af7f
Fixes repeated adminhelp message
2017-07-07 11:36:59 -04:00
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
a1d829126f
Merge pull request #29076 from Cyberboss/LOCK_IT_DOWN
...
Fixes permissions elevation exploit
2017-07-07 11:37:28 -03:00
b1f76269b4
Fixes permissions elevation exploit
2017-07-07 10:29:14 -04:00
e74ba17b96
Merge pull request #29080 from ShizCalev/sm-attack-tweaks
...
Removed silicon SM interact message
2017-07-07 10:23:04 -04:00
f36a2d5fc0
Merge pull request #29083 from kevinz000/patch-239
...
De-lags sandbox a bit
2017-07-07 11:21:16 -03:00
6c8b13dd67
Merge pull request #29095 from ChangelingRain/windowfix
...
Windows now have the proper starting health
2017-07-07 10:02:47 -04:00
8abc1877ff
Merge pull request #29085 from ShizCalev/sm-rounding
...
Changes SM integrity rounding
2017-07-07 09:52:56 -04:00
c1e3ac82ec
Merge pull request #29081 from Fox-McCloud/reflect-refactor
...
Minor Projectile Reflection Refactor
2017-07-07 09:52:45 -04:00
f97f0afa7f
Update window.dm
2017-07-07 09:18:54 -04:00
289567a2f1
Update window.dm
2017-07-07 08:30:04 -04:00
70f1f9a40d
Update window.dm
2017-07-07 08:22:33 -04:00
30c00659a9
Update window.dm
2017-07-07 07:56:23 -04:00
c172578fda
Ups the intergrity of reinforced plasma windows
...
They need to be SME-worthy
2017-07-07 07:48:55 -04:00
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
5fba57358b
Minor code clean up in magnet controller ( #29074 )
2017-07-06 22:43:31 -05:00
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
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
0ad378a7bb
Actually fixes wormhole jaunters, and no it was not my fault. ( #28998 )
2017-07-06 22:15:35 -03:00
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
5868aedcab
initial ( #29075 )
2017-07-06 22:10:01 -03:00
0f7dff1a19
Merge pull request #29068 from ShizCalev/lowercase
...
Lowercased computer names
2017-07-06 22:09:11 -03:00
3388e735e6
Speeds up SSoverlays ( #29037 )
2017-07-06 20:20:44 -04:00
7324244459
Doubles goonchat scroll snap tolerance ( #29056 )
2017-07-06 20:19:34 -04:00
c478796ee9
New portgen icons
2017-07-06 20:10:58 -04:00
ddeab5f6e3
Windows now have the proper starting health
2017-07-06 17:44:50 -04:00
46b16513e2
it's truly false
2017-07-06 16:13:22 -04:00
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
44066d2258
Switch instead
2017-07-06 14:09:00 -04:00
9eafe2f28e
changed playsound to src
2017-07-06 13:56:10 -04:00
1166b6ccc4
Adds alarm sounds to SM
2017-07-06 13:39:00 -04:00
12d70973f0
Correction
2017-07-06 12:12:04 -04:00
ce590cd648
Fixes windows not returning an Initialize hint ( #29038 )
2017-07-06 13:03:23 -03:00
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
Leo
MoreRobustThanYou
Jordan Brown
Ashe Higgs
Kyle Spier-Swenson
Joan Lung
Ergovisavi
kevinz000
oranges
Tacolizard
KorPhaeron
Fox-McCloud
Shadowlight213
shizcalev