Commit Graph

32619 Commits

Author SHA1 Message Date
Joan Lung e55e4db6e6 Merge pull request #23059 from MrStonedOne/patch-287
Fixes afk tracker
2017-01-17 18:42:23 -05:00
Militaires 5677f60518 hopefully fixes my 4gb of runtime #23058 (#23060)
* sleepight pupper

* boop

* boom explosion habbon

* wew ladder.

kor tell me the varname cock tobbagan dont just tell me it exists and you dont poin

* bambi in spess

* more shitfuck

* GOD DAMMIT ITS GONNA BE FUCKING HOT AAA

* commit this dick you fucking tub

* GIGANTIC REFACTOR 2.0

* OH YEAH THE CREAM RISES TO THE TOP

* antur

* aaaaaa

* boat

* wew ladder

* bman

* yaaaaaaaaaaaaaaaaaaawwwwwwwwwwwwwwwwwww

* STEEL CORRIDOR

* fuck my shitfuck

* DON
2017-01-18 03:14:34 +04:00
Mervill 5634779eee Using a welder to repair a mining drone now follows standard behaviour (#23032)
* using a welder to repair a mining drone now follows standard behaviour

* cost tweak

* You now get welding glasses with the mining drone when you redeem the mining voucher
2017-01-17 21:19:15 +01:00
Mervill d818e4a232 Mousetrap will kill mice again, mousetraps description is a bit clearer (#23022)
* mousetrap will kill mice again, mousetraps description is a bit clearer

* readds the assembly examine text, now explicitly indicates the "not armed" state
2017-01-17 20:57:36 +01:00
uraniummeltdown f0315372e2 More AI holograms (#21509)
* redone the AI hologram selection menu, new "ancient machine" hologram, more holograms available, sechailer phrases now able to be selected

* narsie hologram

* got rid of useless file, made lists and switches better

* reduced lines by getting rid of useless switch and setting icon file in list

* finishing touch

* reverted sechailer changes

* fixes antur's reee
2017-01-17 10:09:01 +01:00
Cheridan 9f4c08ad4c Merge pull request #23042 from ChangelingRain/reportfix
Fixes news reports for certain modes
2017-01-17 01:40:26 -06:00
Kyle Spier-Swenson 254bcc97ed Fixes afk tracker
As a bonus, we only track pings while the client is active.
2017-01-16 15:21:52 -08:00
Cheridan 1620bec15d Merge pull request #23038 from ChangelingRain/geismove
Moves some code
2017-01-16 13:54:55 -06:00
Cheridan d5f961402c Merge pull request #23037 from ChangelingRain/clockworklattice
Ratvar will now convert lattices and catwalks to clockwork versions
2017-01-16 13:07:48 -06:00
PKPenguin321 c7a319c011 fixes chairs not updating their layer (#23029)
didnt realize these overrode post_buckle_mob, my bad
2017-01-16 13:19:45 -05:00
Mervill 09efbd6367 fixes gramatical switcharoo in filing cabinet text (#23026) 2017-01-16 13:18:40 -05:00
XDTM 27470c8692 Won't burn calories in spess (#23031) 2017-01-16 13:18:12 -05:00
AnturK 809835796a Fixes pill duping (#23033) 2017-01-16 13:14:31 -05:00
Militaires 980411b961 Refactors riding to a datum and applies it to vehicles, allowing for mobs to be ridden. (#22420)
* sleepight pupper

* boop

* boom explosion habbon

* wew ladder.

kor tell me the varname cock tobbagan dont just tell me it exists and you dont poin

* bambi in spess

* more shitfuck

* GOD DAMMIT ITS GONNA BE FUCKING HOT AAA

* commit this dick you fucking tub

* GIGANTIC REFACTOR 2.0

* OH YEAH THE CREAM RISES TO THE TOP

* antur

* aaaaaa

* boat

* wew ladder

* bman

* yaaaaaaaaaaaaaaaaaaawwwwwwwwwwwwwwwwwww

* STEEL CORRIDOR
2017-01-16 19:02:42 +01:00
oranges 3ac94a85cc Merge pull request #22994 from XDTM/ChameleonPdaNowUseful
PDA can update their name when an agent id is inside
2017-01-16 20:58:54 +13:00
AnturK 6c0dc9db15 Fixes bsa artillery construction issues. (#23011)
* Fixes bsa artillery construction issues.

* 1 -> TRUE

* Nothing to see here
2017-01-16 20:57:24 +13:00
Christopher 575e1489a5 Makes "Flash burnt out!" Message Bigger (#23008)
* Makes "Flash burnt out!" message bigger.

* Improved code.
2017-01-16 20:56:10 +13:00
oranges 0dedd2b17e Merge pull request #23007 from XDTM/GrenadeFade
Makes chem splash based on distance
2017-01-16 20:55:01 +13:00
oranges 6d71e8bdc1 Merge pull request #22999 from Cyberboss/patch-6
Removes dupe armor initialization
2017-01-16 20:54:25 +13:00
XDTM d35517d181 Less bag hitting (#22995) 2017-01-15 23:47:04 -05:00
oranges 03fa15f59d Merge pull request #23004 from KorPhaeron/ninja
Fixes ninja teleport
2017-01-16 16:22:07 +13:00
Joan Lung 41373061c3 Misc clockcult grammar and fixes (#22983)
* Misc clockcult grammar and fixes

* easier
2017-01-16 13:30:14 +13:00
Joan Lung 2f74a5afa9 Fixes news reports for certain modes 2017-01-15 16:20:11 -05:00
Joan Lung 062b5c4013 clockwork catwalks 2017-01-15 14:53:01 -05:00
Joan Lung f53f4188d7 Moves some code 2017-01-15 11:50:05 -05:00
Joan Lung 3f0009b12e Ratvar will now convert lattices to clockwork lattices 2017-01-15 11:45:45 -05:00
Leo 39eabb79b2 Properly closes the A tag. (#23009) 2017-01-15 11:31:00 -05:00
Mervill cd0912f77f seedRuins exits with a warning if provided a z level that does not exist (#22860)
* seedRuins exits with a warning if provided a z level that does not exist

* if no z levels are provided, don't generate any ruins
2017-01-15 21:17:53 +13:00
Cyberboss 054a22d9d4 Removes maintenance panels from firedoors (#22984)
* Removes maintenance panels from firedoors

* Add a screwdriver to keep welded locks sacred

* Add the missing quote

* Keep it hittable
2017-01-15 20:50:08 +13:00
XDTM 3bb9cfbefb Fixes portable chem dispensers wrenching (#22981) 2017-01-14 12:23:46 +01:00
XDTM a3382142cc Makes chem splash based on distance 2017-01-14 10:58:33 +01:00
KorPhaeron e7f890697e It's a bugged ninja code episode 2017-01-13 18:14:42 -06:00
Cyberboss 4636e14923 Removes dupe armor initialization 2017-01-13 18:18:20 -05:00
oranges efe07959a5 Merge pull request #22980 from Cyberboss/patch-8
Fixes an imaginary number
2017-01-14 11:58:55 +13:00
oranges 2d60dcda2f Merge pull request #22979 from Cyberboss/patch-6
Fixes a division by zero runtime
2017-01-14 11:58:30 +13:00
oranges a840d1ffe2 Merge pull request #22975 from coiax/fix-15384
Fixes floors flashing red after doomsday stops
2017-01-14 11:57:47 +13:00
oranges 2b7798b601 Merge pull request #22972 from Thunder12345/fireisnotgreenpinkorblack
No more colourful fire
2017-01-14 11:56:32 +13:00
kevinz000 33a502a03b Update gravitygenerator.dm (#22971)
Prevents gravity generator from being thrown, and therefore completely destroyed by meteorshots.
2017-01-14 11:56:06 +13:00
kevinz000 646bb99b99 Lessens spray can spam (#22970)
* Update crayons.dm

* Update crayons.dm
2017-01-14 11:55:35 +13:00
oranges ddb4b89619 Merge pull request #22968 from XDTM/LargeSlime
Fixes large grenade interaction with slime cores
2017-01-14 11:55:10 +13:00
oranges f3bfa1c7e7 Merge pull request #22965 from XDTM/KnockKnock
Fixes swarmers not being able to hit doors
2017-01-14 11:54:49 +13:00
TribeOfBeavers 69ab82d614 Fixes synthetic limbs (#22960)
* Updates icons of created limbs

* Adds Plasmamen limbs to human_parts_greyscale
2017-01-14 11:54:22 +13:00
Cyberboss 0a79e94bd6 In which Cyberboss doesn't call procs on a replaced turf (#22957)
* This'll do it

* SRC!
2017-01-14 11:53:54 +13:00
oranges 7aad3f096e Merge pull request #22956 from PKPenguin321/patch-9
refactors chair layer updates (kills tactical chairs)
2017-01-14 11:53:35 +13:00
oranges cae2577e2e Merge pull request #22955 from Cruix/gang_refactor
Refactored gangtool code
2017-01-14 11:53:01 +13:00
Militaires 66a681f6b4 fixes (#22685) swarmers eating catwalks with wires on them. (#22953)
* boom bara beem

* aa
2017-01-14 11:52:36 +13:00
Cyberboss 326bdfd76b Finally fixed the proximity runtime (#22950)
* Finally fixed the proximity runtime

Also fixed some misue of Move(d)s and destroys

* Fixed remove_from_proximity_list

* Fine, we'll do it your way

* Should sense/update loc here as well

* Assume deez nuts
2017-01-14 11:52:07 +13:00
Cyberboss 81b889264e Some code cleanup (#22949)
* kil meh

* Datums can hold gases. e.g. pipelines
2017-01-14 11:51:32 +13:00
oranges ed06acafd8 Merge pull request #22948 from Mervill/firealarm_real
Fire alarms not on z-level one will always have green security status
2017-01-14 11:51:14 +13:00
oranges 08f830c416 Merge pull request #22946 from coiax/pyro-slimes
Fixes pyroclastic anomaly slime colour
2017-01-14 11:50:57 +13:00