cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-22 03:27:05 +01:00
Code Issues Packages Projects Releases Wiki Activity
60,117 Commits 14 Branches 2 Tags
dev-docs-readme
Commit Graph
1209 Commits
Author SHA1 Message Date
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
Fox McCloudandGitHub 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 LemonandGitHub 5f11e5945e Merge pull request #9367 from TDSSS/hypospray-belt 
Allows medical belts to hold hyposprays
 2018-09-04 09:21:37 -07:00
Unknown 62c7ba1f80 Merge remote-tracking branch 'upstream/master' into Memes 2018-08-29 19:23:06 +02: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
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
TDSSS 12a2660619 added hyposprays to medbelt 2018-08-16 14:32:37 +02:00
SuperhatsandGitHub 90874a1e94 Merge pull request #2 from Superhats/master 
Whoops, i was super behind
 2018-08-10 10:55:03 +02:00
Kyep 102ff67095 fixes merge conflict 2018-08-01 04:13:22 -07:00
FalseIncarnate d4bada645a Fixes invisible egg and donut boxes 
Also removed duplicate instances of the pizza box icons
 2018-07-22 15:33:21 -04:00
SuperhatsandGitHub 9f575c6281 Update firstaid.dm 2018-07-20 13:00:50 +02:00
Fox McCloud b2c8f051b1 Merge remote-tracking branch 'upstream/master' into camera-damage-refactor 2018-07-15 16:31:50 -04:00
Superhats 4eb2d7e397 Bye bye, combat defib 2018-07-15 21:00:47 +02:00
Superhats bf5b7e822e Re-adds advanced magboots, a bunch of implants, safety on the defib 2018-07-15 18:50:02 +02:00
Superhats 6704f2b999 yeet 2018-07-15 00:29:08 +02:00
Kyep 3fb7a5e526 Merge remote-tracking branch 'ParadiseSS13/master' into depot 2018-06-28 18:02:48 -07:00
Kyep 7d361cf59b made some traps fairer 2018-06-22 01:05:03 -07:00
MINIMAN10000 868167d84c Fix cardboard drop count 2018-06-19 13:38:02 -07:00
Kyep 5e6407e3f8 Merge remote-tracking branch 'ParadiseSS13/master' into depot 2018-06-13 23:42:36 -07:00
Kyep 4d4eb16a3a fixes merge conflict 2018-06-06 16:32:31 -07:00
Fox McCloud 202fbe92fb Cleans Up Medbot Code, Re-Allows Syndicate Medbot 2018-05-29 12:15:04 -04:00
Tayyyyyyy 919bd7aaf2 Replace \his, \he, \him, \himself 2018-05-25 18:39:37 -07:00
Tayyyyyyy 98c6ddf5a7 Fix his, he, him 2018-05-25 18:34:28 -07:00
Tayyyyyyy dd120a00f0 Their 2018-05-25 18:34:24 -07:00
Fox McCloud f328db7b2a Refactors Camera Damage and Disabling 2018-05-20 05:45:07 -04:00
Fox McCloud b3524505b5 tweak 2018-05-14 17:51:13 -04:00
Fox McCloud 8845262d65 Merge remote-tracking branch 'upstream/master' into holo-projector 
# Conflicts:
#	_maps/map_files/cyberiad/cyberiad.dmm
#	paradise.dme
 2018-05-04 16:37:24 -04:00
Fox McCloud e649a72923 Emptying Stop-gap 2018-04-30 03:53:49 -04:00
Fox McCloud b394cf3624 Ports Holoprojectors 2018-04-30 00:24:46 -04:00
Kyep c3f271449e fixes merge conflicts with weapon removals 2018-04-26 00:09:18 -07:00
Kyep 08fdc2bce3 merge conflict fix 2018-04-25 23:48:44 -07:00
Fox McCloud 8c7b543415 The Great Conflictening 2.0: Removes /obj/item/device 2018-04-25 23:07:35 -04:00
Fox McCloud eafd57487c Merge remote-tracking branch 'upstream/master' into component-port 
# Conflicts:
#	paradise.dme
 2018-04-23 13:54:50 -04:00
Fox McCloud 0382afcb33 Ports TG Components 2018-04-21 01:22:50 -04:00
tigercat2000 c03621c508 Completely Overhaul Logging 
This is a merged port from /tg/station and Virgo on logging standards.
The diary has been replaced with GLOB.world_game_log, diaryofmeanpeople
is gone (because it wasn't actually used) and a whole bunch of logging
procs have been changed to optimize Splunk.
 2018-04-19 15:07:59 -08:00
Fox McCloud 2b25584372 Merge remote-tracking branch 'upstream/master' into remove-weapons 2018-04-19 17:01:38 -04:00
tigercat2000andGitHub 17fd8e8a6a Merge pull request #8819 from Kyep/syndi_outfit_boots 
Improves admin outfits, fixes magboots, adds special antags
 2018-04-16 18:28:03 -07:00
Fox McCloud 5c4aa9b3fd Removes All Weapons 2018-04-15 16:25:56 -04:00
Kyep 2cb4e1f75c Fox requests 2018-04-08 08:03:34 -07:00
Kyep ca8bb33a58 Tiger requests 2018-04-07 14:01:48 -07:00
Kyep 1b6b1deecc fixes merge conflict in custom_grenades.dm 2018-04-01 18:59:25 -07:00
Kyep e014f02324 Improves admin outfits, fixes magboots being missing 2018-03-26 15:44:17 -07:00
tigercat2000andGitHub b1278de3d2 Merge pull request #8674 from uraniummeltdown/attacks 
[READY] Attack Code Update
 2018-03-22 11:55:53 -07:00
tigercat2000andGitHub 5a756ad3c9 Merge pull request #8708 from Birdtalon/nanocalcium 
Nanocalcium: Bone repair drug.
 2018-03-19 13:37:20 -07:00
tigercat2000andGitHub 7bee9ab6dc Merge pull request #8761 from IK3I/WrathOfSinguloth 
Bags of bags of holding no longer possible.
 2018-03-19 11:54:52 -07:00
IK3I e9f3ee5cf5 No. 2018-03-13 22:48:23 -05:00
Piccione 8799c0cf42 Put the correct drug id in the cigarette for THC 2018-03-08 23:24:33 +01:00
Piccione 35f1956db7 Switched the Space Drugs in the Weed Cigarettes with more healthy THC 2018-03-08 23:18:54 +01:00