Commit Graph

28744 Commits

Author SHA1 Message Date
Alffd
e49bcd4d15 Add noise sensor and add muzzles to protolathe 2018-08-14 00:53:39 -04:00
Alffd
48bc4ba081 Initial muzzle and emote changes 2018-08-14 00:53:39 -04:00
shazbot194
9d3c58eee9 Fixes sawing off 2018-08-08 10:24:17 -08: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
Kyep
cfce50fe8a moves core to /area/ subtype, bugfix 2018-08-06 23:17:30 -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
Tails2091
b484ca934d Reformated Cargo Merch Store
Now matches Prize Machine.
2018-08-02 18:05:34 -04:00
Tails2091
7e68c671fc Fixed Merch Store Typos
Also listed in order by price.
2018-08-02 18:04:58 -04:00
Fox McCloud
7f2030415f staff of change fix 2018-08-02 13:43:44 -04:00
Fox McCloud
cafdfcd521 Merge pull request #9299 from variableundefined/LessRuntime
Fixes customizable food runtime
2018-08-02 12:41:43 -04:00
Fox McCloud
18f8bd06b5 Merge pull request #9300 from variableundefined/MegaphoneLog
Add say logging for megaphone
2018-08-02 12:40:28 -04:00
Kyep
62b7f6b55b split jaunter change also 2018-08-02 09:39:00 -07:00
Kyep
45a88d4f3f split teleportation changes out into another PR 2018-08-02 09:36:10 -07:00
Kyep
9091d4cd9c move shieldgen.dm refactor edits to PR #9302 2018-08-02 09:21:08 -07:00
Kyep
ce4775c6af z6 mapmerge, teleportation.dm refactor, stop bluespace tomatoes working in tele_proof areas 2018-08-02 09:03:17 -07:00
variableundefined
7e216d32bd Add say logging for megaphone 2018-08-02 14:59:32 +08:00
variableundefined
eaa697173e Fixes customizable runtime 2018-08-02 14:35:37 +08:00
Aurorablade
e8bb3451db Stop making Late night PRs fethas 2018-08-02 02:22:02 -04:00
Crazy Lemon
513a55e097 Merge pull request #9293 from variableundefined/Moreruntime
Fixes some more runtime
2018-08-01 18:07:03 -07:00
Tails2091
b9312aa323 Changed buying to button instead of link text
Makes it easier to click.
2018-08-01 19:01:21 -04:00
AffectedArc07
95cd3f5ae2 Fixes the barber spawning with 2 pairs of shoes 2018-08-01 18:58:26 +01:00
Kyep
102ff67095 fixes merge conflict 2018-08-01 04:13:22 -07:00