cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-01-09 00:52:09 +00:00
Code Issues Packages Projects Releases Wiki Activity
38,716 Commits 26 Branches 2 Tags
0eabc14cc6ef3d9c8c014ffca2d0e03739cb1e14
Commit Graph

17824 Commits

Author SHA1 Message Date
Crazy Lemon
0eabc14cc6 Merge pull request #9384 from variableundefined/TicketRuntime 
Fixes a runtime with admin ticket
 2018-08-22 22:25:13 -07:00
Crazy Lemon
bf8520528c Merge pull request #9257 from variableundefined/WelderCableOverheal 
Adds overheal to welder & cable coil
 2018-08-22 22:15:38 -07:00
Birdtalon
15c947a21c replaces equip_to_slot_or_del() with equip_to_slot_if_possible() 2018-08-21 19:00:57 +01:00
variableundefined
37d0056e0f Fixes a runtime with admin ticket 2018-08-19 13:37:54 +08: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
c22f4d4b2f Merge pull request #9352 from MarsM0nd/fix_fax 
Fixes fax radio reply
 2018-08-15 13:53:03 -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
Birdtalon
d9555921b4 adds user feedback 2018-08-10 12:17:15 +01:00
shazbot194
9d3c58eee9 Fixes sawing off 2018-08-08 10:24:17 -08: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
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
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
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
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
Crazy Lemon
bfb00912af Merge pull request #9113 from shazbot194/Shotguns_mk2 
Shortening Sawn off Shotguns
 2018-08-03 13:43:24 -07:00
Fox McCloud
3193d599cb Medical Hypospray 2018-08-02 23:39:15 -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
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
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
ce4775c6af z6 mapmerge, teleportation.dm refactor, stop bluespace tomatoes working in tele_proof areas 2018-08-02 09:03:17 -07: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
Kyep
102ff67095 fixes merge conflict 2018-08-01 04:13:22 -07:00
variableundefined
9c2e725e4b Fixes some more runtime 2018-08-01 17:44:09 +08:00
Crazy Lemon
f0ce356dd9 Merge pull request #9289 from variableundefined/HoodRuntime 
Fix hood runtime
 2018-07-31 23:06:34 -07:00
variableundefined
082703e2ff Fix hood runtime 2018-08-01 13:05:34 +08:00