Commit Graph

28760 Commits

Author SHA1 Message Date
Gwydion Brain
2d8a461f5d Mr Chang sprite 2018-08-20 17:23:34 -07:00
Crazy Lemon
275a4d4c54 Merge pull request #9325 from Agameofscones/medicalhypo_sprite
Medical Hypospray sprite change
2018-08-16 11:14:23 -07:00
Crazy Lemon
d5be15c700 Merge pull request #9333 from Birdtalon/grabbin-pills
Sanity check for pill creation (0u pills)
2018-08-16 10:45:46 -07:00
Crazy Lemon
e8b4b97bfd Merge pull request #9334 from Birdtalon/chemdispenser
All obj/machinery is now below obj layer.
2018-08-16 10:45:03 -07:00
Crazy Lemon
c22f4d4b2f Merge pull request #9352 from MarsM0nd/fix_fax
Fixes fax radio reply
2018-08-15 13:53:03 -07:00
Crazy Lemon
441a499948 Merge pull request #9351 from variableundefined/ComfreyFix
Fixes comfrey
2018-08-15 13:42:29 -07:00
Mars
218aa2402d Macro usage 2018-08-15 22:27:53 +02:00
tlc2013
9060e4e285 Adds the Transylvanian Coat, ported from /vg/station. Also adds it to the Autodrobe. 2018-08-13 23:44:52 -06:00
Mars
a5c9cfd1cb Fixes and polishes fax radio replies
Can use the radio option to reply to faxes again.
Centcomm doesn't reply over radio to syndicate faxes.
Removes unreachable code.
2018-08-12 12:00:32 +02:00
variableundefined
a82104d4ed Fixes comfrey 2018-08-12 09:33:37 +08:00
Birdtalon
d9555921b4 adds user feedback 2018-08-10 12:17:15 +01:00
Birdtalon
bcf9a9ef0d makes all obj/machinery below obj layer 2018-08-09 22:30:38 +01:00
shazbot194
9d3c58eee9 Fixes sawing off 2018-08-08 10:24:17 -08:00
Birdtalon
9b3cf7f835 moves the tank dispenser below obj layer 2018-08-08 16:10:25 +01:00
Birdtalon
5319c3968f Moves chem dispensers below obj layer 2018-08-08 14:56:53 +01:00
Birdtalon
a987dac795 changes the check to total_volume 2018-08-08 14:07:51 +01:00
Birdtalon
3472eba242 prevents 0 value pills being created 2018-08-08 13:32:24 +01:00
Crazy Lemon
4bf6c6130d Merge pull request #8280 from Anasari/CardPort
Port Polaris Card
2018-08-07 12:34:08 -07:00
Crazy Lemon
6a925fb205 Merge pull request #8515 from Kyep/depot
Reworks Syndicate Supply Depot
2018-08-07 09:34:02 -07:00
Gwydion Brain
f1bdbaf375 medicalhypo initial 2a 2018-08-07 03:49:49 -07:00
Kyep
cfce50fe8a moves core to /area/ subtype, bugfix 2018-08-06 23:17:30 -07:00
Gwydion Brain
442b7320b8 medicalhypo initial 1A
+medivend_hypo icon state
=changes medical hypospray to use said sprite
=changes medical hypospray description to hopefully confuse security and traitors less.
2018-08-06 22:19:08 -07:00
Crazy Lemon
08044a6b58 Merge pull request #9266 from Kyep/simple_animal_intent
Allows simple_animals to change intent
2018-08-06 21:27:46 -07:00
Kyep
d56f2105fd max_fire_range re-added 2018-08-06 21:26:53 -07:00
Kyep
030d2c004e to_chat 2018-08-06 21:21:01 -07:00
Kyep
477912dc72 CrazyLemon 2, more small stuff 2018-08-06 21:19:10 -07:00
Kyep
07e5081526 moves depot areas to new file 2018-08-06 21:12:05 -07:00
Kyep
1f65c9a734 CrazyLemon 1, all the minor issues 2018-08-06 21:08:01 -07:00
Fox McCloud
fd5589ec37 Merge pull request #8788 from MarsM0nd/Tail_lash_fix
Tail  whip logic fix and logging
2018-08-06 23:21:59 -04:00
Fox McCloud
255b982f17 Merge pull request #9288 from Tails2091/PrizeMachien
Reformat of Prize Machine & Merch Store List
2018-08-06 19:32:02 -04:00
Tails2091
0d07d87421 Borders Have Been Reestablished 2018-08-05 22:45:55 -04:00
Crazy Lemon
27c5aacdc1 Merge pull request #9306 from Tails2091/TherapyFix
Fixed Therapy Doll Issue
2018-08-05 18:39:12 -07:00
Crazy Lemon
4aed8e20e8 Merge pull request #9295 from AffectedArc07/barber-shoes
Fixes the barber spawning with 2 pairs of shoes
2018-08-05 18:28:59 -07:00
Crazy Lemon
efb582412d Merge pull request #9298 from Aurorablade/Headsets
Slight TG Headset Communication port
2018-08-05 11:30:50 -07:00
Aurorablade
b81f61ae58 Fixes 2018-08-04 23:27:20 -04:00
Fox McCloud
4b0cbda042 Merge pull request #9316 from Crazylemon64/spaceruins_fix
Space ruins no longer can fill the border of the level
2018-08-04 20:44:48 -04:00
Crazy Lemon
3384e50542 Merge pull request #9307 from Fox-McCloud/medical-hypo
Medical Hypospray
2018-08-04 17:31:06 -07:00
Crazylemon64
1ba1a953b3 Adds extra configuration for space ruins, enables them by default 2018-08-04 14:39:54 -07:00
Crazylemon64
af64e7a8ed Space ruins no longer can fill the border of the level 2018-08-04 14:39:47 -07:00
Mars
4e86cc9f95 Merge conflict fix and proper text 2018-08-04 15:53:38 +02:00
Fox McCloud
4a3e5e00aa Merge pull request #9308 from Birdtalon/kingstons
fixes assigning virus name for Kingstons
2018-08-03 23:16:02 -04:00
Crazy Lemon
bfb00912af Merge pull request #9113 from shazbot194/Shotguns_mk2
Shortening Sawn off Shotguns
2018-08-03 13:43:24 -07:00
Tails2091
3c776efd1b Changed Card Icon Update 2018-08-03 15:39:20 -04:00
Birdtalon
62cad49207 adds initial 2018-08-03 20:16:03 +01:00
Birdtalon
5bd4a2c125 fixes assigning virus name for Kingstons 2018-08-03 19:56:19 +01:00
Fox McCloud
53fb8a1ab1 tweak 2018-08-03 10:23:27 -04:00
Fox McCloud
3193d599cb Medical Hypospray 2018-08-02 23:39:15 -04:00
Tails2091
c668c25e96 Fixed Therapy Doll Issue
Fixed issue #5167
Added icon update function to cards
Changed for loop to right format
Removed katana dupe
2018-08-02 21:33:28 -04:00
Crazy Lemon
1452f82eaf Merge pull request #9265 from Fox-McCloud/species-refactor-follow-up
Species Refactor Followup
2018-08-02 17:08:57 -07:00
Kyep
b5852af194 handles pods, double agents, shield phase-through 2018-08-02 16:43:48 -07:00