cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-01-25 00:41:48 +00:00
Code Issues Packages Projects Releases Wiki Activity
39,110 Commits 29 Branches 2 Tags
55fa8bb5bd9a0c3e77063cfc3cb221105983e7fb
Commit Graph

4515 Commits

Author SHA1 Message Date
Birdtalon
55fa8bb5bd tidying up 2018-09-22 15:53:37 +01:00
Birdtalon
eb312f526f gamma fireproof suits, fixed an accidental removal in scanners.dm 2018-09-22 15:11:19 +01:00
Birdtalon
d35155baec Merge branch 'master' into ERT-gun 
# Conflicts:
#	code/modules/response_team/ert_outfits.dm
 2018-09-22 14:04:35 +01:00
Birdtalon
424f3ac200 changes to ERT equipment datums, organises some files a little clearer 2018-09-22 14:00:41 +01:00
Birdtalon
5dff419518 adds T4 thermite charge, alters thermitemelt() slightly to add speed parameter 2018-09-20 21:45:45 +01:00
Birdtalon
9eea8fa4cd finishing touches to scanner 
corrections to update_icon

updating icons, charging the analyser, power consumption tweaks
 2018-09-20 21:45:43 +01:00
Birdtalon
0a83572294 adds scanner icons 
adds more code for ERT scanner

ert scanner
 2018-09-20 21:45:28 +01:00
Fox McCloud
6832dbe74e Merge pull request #9373 from variableundefined/walletdecal 
Wallet icon defaults to green if it is filled with an id of any type
 2018-09-09 18:09:56 -04:00
Crazy Lemon
847ef225d0 Merge pull request #9479 from datlo/megaphonevoicefix 
Fixes #8439, adds font check to the megaphone
 2018-09-04 10:22:42 -07:00
Crazy Lemon
7f86521753 Merge pull request #9283 from Aurorablade/PlasmaIsGrifingMe 
Adds some Logging to some items
 2018-09-04 09:23:11 -07:00
Crazy Lemon
5f11e5945e Merge pull request #9367 from TDSSS/hypospray-belt 
Allows medical belts to hold hyposprays
 2018-09-04 09:21:37 -07:00
datlo
5c3aeef45e replace locate check 2018-09-04 11:47:15 +01:00
datlo
0418e51a21 Adds font check to the megaphone 
Megaphone now carries over the user's font (wingdings, comic sans, and
any other font in mind.speech_span)
 2018-09-03 16:32:20 +01:00
Unknown
62c7ba1f80 Merge remote-tracking branch 'upstream/master' into Memes 2018-08-29 19:23:06 +02:00
Crazy Lemon
e8e5928edd Merge pull request #9430 from FlattestGuitar/forceMove 
you can remove items from storage with forceMove() properly
 2018-08-29 08:29:26 -07:00
variableundefined
b874549978 Ensure bola cannot snare anyone without enough legs 2018-08-28 22:35:31 +08:00
Unknown
b89eec6ce6 forceMove for storage item removal 2018-08-28 10:22:45 +02:00
TDSSS
503f9b9166 Fixed indentation 2018-08-23 12:34:06 +02:00
Crazy Lemon
195e199552 Merge pull request #9061 from Anasari/TGRefundPort 
Port over Fox's refactored syndicate item refund from TG.
 2018-08-22 22:51:12 -07:00
Crazy Lemon
d59d2e76be Merge pull request #9303 from Kyep/teleport_fixes 
Teleportation Fixes
 2018-08-22 22:44:18 -07:00
Aurorablade
b7002a414f Removes a leading var 2018-08-23 01:38:56 -04:00
Crazy Lemon
058d339493 Merge pull request #9336 from Kyep/depot_fixes_1 
Depot Fixes
 2018-08-22 22:33:09 -07:00
Crazy Lemon
b3f5af433a Merge pull request #9371 from variableundefined/DefibPaddleDetach 
Defib paddles snap away if you walk away from the defib
 2018-08-22 22:27:03 -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
variableundefined
80123d90ad Stop implantcase from disappearing 2018-08-22 22:36:02 +08:00
variableundefined
c21dc7929a Wallet icon defaults to green if it is filled with an id of any type 2018-08-16 22:22:51 +08:00
variableundefined
845401725e Defib paddles snap away if you walk away from the defib 2018-08-16 21:49:39 +08:00
TDSSS
12a2660619 added hyposprays to medbelt 2018-08-16 14:32:37 +02:00
Kyep
f40127b348 handles incoming emagged teleport to syndibeacon 2018-08-16 02:05:40 -07:00
Kyep
1e894f11ee CrazyLemon RPD changes 2018-08-15 22:36:53 -07:00
Kyep
7cebfc20c4 fixes for RPD and RCS exploits 2018-08-15 01:48:34 -07:00
variableundefined
a82104d4ed Fixes comfrey 2018-08-12 09:33:37 +08:00
Superhats
90874a1e94 Merge pull request #2 from Superhats/master 
Whoops, i was super behind
 2018-08-10 10:55:03 +02:00
Crazy Lemon
6a925fb205 Merge pull request #8515 from Kyep/depot 
Reworks Syndicate Supply Depot
 2018-08-07 09:34:02 -07:00
Kyep
1f65c9a734 CrazyLemon 1, all the minor issues 2018-08-06 21:08:01 -07:00
Crazy Lemon
27c5aacdc1 Merge pull request #9306 from Tails2091/TherapyFix 
Fixed Therapy Doll Issue
 2018-08-05 18:39:12 -07:00
Tails2091
3c776efd1b Changed Card Icon Update 2018-08-03 15:39:20 -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
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
7e216d32bd Add say logging for megaphone 2018-08-02 14:59:32 +08:00
Kyep
102ff67095 fixes merge conflict 2018-08-01 04:13:22 -07:00
Aurorablade
55c211f144 Lemins Feedback 2018-07-31 16:44:39 -04:00
Aurorablade
1ba0e9c7c4 i am tired 2018-07-31 04:06:57 -04:00
Anasari
b151aec3bc Fixes merge conflict 2018-07-31 14:31:14 +08:00
Anasari
eb776551d5 Revert "Remove check_uplink_validity proc as it isn't useful yet" 
This reverts commit 78360811c1.
 2018-07-31 13:47:42 +08:00
Anasari
78360811c1 Remove check_uplink_validity proc as it isn't useful yet 2018-07-31 13:41:35 +08:00
Anasari
fb0cd5d94e Fixes & minor uplink items refactor 2018-07-31 13:37:24 +08:00
Tails2091
fef2b4c002 we the good format now 2018-07-29 13:53:45 -04:00
Tails2091
b08653c35a Changes while loop to for 
Why was this a while loop?
 2018-07-28 18:01:23 -04:00