cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2025-12-21 07:42:21 +00:00
Code Issues Packages Projects Releases Wiki Activity
29,527 Commits 26 Branches 2 Tags
288af9f92cb15d93b0956a8b32b2f47ebb0dfd93
Commit Graph

12118 Commits

Author SHA1 Message Date
Fox-McCloud
fc6514f5ba Merge remote-tracking branch 'upstream/master' into tg-weather 2016-07-16 11:07:43 -04:00
TheDZD
9bf946b5b6 Merge pull request #5054 from Fox-McCloud/mining-tweaks 
Various Mining Tweaks
 2016-07-16 10:57:54 -04:00
TheDZD
0d51787dbb Merge pull request #5072 from Fox-McCloud/belt-fixes 
Belt Overlay Fixes
 2016-07-16 10:44:01 -04:00
Fox McCloud
744777a944 Merge pull request #4971 from monster860/datum_browserify 
Makes a bunch of UI's use /datum/browser
 2016-07-16 08:52:18 -04:00
monster860
e32418956e open(0) 2016-07-16 08:27:37 -04:00
Fox McCloud
b76e2d19e0 Merge pull request #5041 from DaveTheHeadcrab/plastique_is_fun 
Plastic Explosives Update
 2016-07-16 04:07:12 -04:00
Fox-McCloud
7751adcffc Belt Overlay Fixes 2016-07-16 02:06:02 -04:00
Fox-McCloud
a1341f02af Sleeper Changes 2016-07-16 01:31:34 -04:00
Fox-McCloud
e6c02e3a2c Merge remote-tracking branch 'upstream/master' into mining-tweaks 2016-07-15 23:16:00 -04:00
Fox McCloud
7c790a8b21 Merge pull request #4780 from Crazylemon64/space_ruins 
Crazypilot's Space Ruins Port
 2016-07-15 22:55:51 -04:00
Fox McCloud
aa2ff8ceea Merge pull request #4843 from FreeStylaLT/youpieceoffuckingshitforgottousemapmerger 
Good heavens look at the time it's SEC REMAP O' CLOCK
 2016-07-15 22:32:28 -04:00
Fox McCloud
be8cc0432d Merge pull request #4691 from taukausanake/plant_hud 
Hydroponics HUD
 2016-07-15 21:47:36 -04:00
SamCroswell
0466499f86 Personal Crafting - Initial Commit 2016-07-15 16:25:37 -04:00
Fox-McCloud
89cb267ae8 Can Scan Vending Machines with your PDA 2016-07-15 13:51:16 -04:00
Mateja Milosevic
21402d2255 what 2016-07-15 17:38:28 +02:00
Mateja Milosevic
0d7ddf3d24 src and tweak 2016-07-15 17:27:22 +02:00
Fox McCloud
5107bca5dd Merge pull request #4899 from FlattestGuitar/loadouts 
Did someone say "loadouts"?
 2016-07-15 11:25:34 -04:00
Mateja Milosevic
9a91b075ad Adds a view counts to newscaster feeds and messages 2016-07-15 17:21:13 +02:00
SamCroswell
e139f81412 PDA Slot Removal + PDA ID Changes 2016-07-15 00:54:14 -04:00
Fox McCloud
c3c9570d46 Merge pull request #5057 from Krausus/UsrTheSrcLuke 
Fixes ERT Creation
 2016-07-14 23:58:39 -04:00
Fox McCloud
66d7b89d9a Merge pull request #4838 from FalseIncarnate/paradise_pop 
Paradise Pop
 2016-07-14 23:58:24 -04:00
Fox McCloud
f7b298f68e Merge pull request #4895 from TullyBurnalot/ArmlessCuffs 
Armless Cuffing and Legless Legcuffing Sense-Making
 2016-07-14 23:30:38 -04:00
Krausus
dceb939539 Fixes ERT creation 
- src is now used instead of usr, where appropriate, meaning one single
person won't be used in the generation of ALL ERT members
- Creation is no longer blocked by input from members who are being
generated
- Members will no longer exist as a naked body until the moment they
finish picking their class
 2016-07-14 23:22:16 -04:00
Fox-McCloud
0fb2bfd8f1 Various Mining Tweaks 2016-07-14 22:07:04 -04:00
TullyBurnalot
c8801b2ff5 Adds sanity check for non-carbon mobs 2016-07-15 00:46:28 +01:00
Fox McCloud
4d3b818232 Merge pull request #5048 from Chakirski/bug1 
Cigpacks Examine Fix
 2016-07-14 18:54:23 -04:00
SamCroswell
23a1d887f3 Better Target Bugfix 2016-07-14 15:51:20 -04:00
Chakirski
6c8fa9f688 cigs... 2016-07-14 10:45:52 -05:00
Fox-McCloud
5216b39339 Ports TG's Weather System 2016-07-14 04:29:28 -04:00
SamCroswell
d0b818cc1b My commit line is a mess at this point IDGAF 2016-07-14 01:45:21 -04:00
SamCroswell
8b94d840fb PLEASE SEND HELP 2016-07-14 01:44:40 -04:00
SamCroswell
a42dcebc21 Fixes a bug with the flash C4 2016-07-14 01:14:22 -04:00
Kyep
f22f5747cd Deletes Parole Implants 
Also deletes parole kit from warden's locker, as it is pointless now.
 2016-07-13 21:44:50 -07:00
SamCroswell
890ae146ca Flashbang Explosives 2016-07-13 23:42:31 -04:00
SamCroswell
cf90405f56 Plastic Explosives Update 2016-07-13 22:04:23 -04:00
TheDZD
8878cc9b15 Merge pull request #4980 from Fox-McCloud/arse-nath 
Adds in Rathen's Secret
 2016-07-12 21:26:02 -04:00
TheDZD
dd2390d9bb Merge pull request #4987 from Fox-McCloud/cyborg-tweaks 
Cyborg Upgrade Additions and Refactor
 2016-07-12 21:22:57 -04:00
TullyBurnalot
2ca5a17c5a Removes trailing return 2016-07-12 04:24:45 +01:00
TullyBurnalot
8682da932a EMPing Restorers kills AIs inside 
- No needless merges happened
- AI Integrity Restorers, if EMP'd, ghost any AI player inside, then
destroys said AI
 2016-07-12 04:09:49 +01:00
Fox-McCloud
a78c6cbf5d changes 2016-07-11 22:45:44 -04:00
Fox McCloud
c803c4f752 Merge pull request #4911 from Kyep/exile_option 
Makes Exile & Lethal Injection Viable
 2016-07-11 21:21:16 -04:00
TheDZD
5ba6e17739 Merge pull request #4917 from TullyBurnalot/BureaucracyUpdate 
Bureaucracy Update
 2016-07-11 21:20:06 -04:00
Fox McCloud
829bbdcba9 Merge pull request #4951 from Kyep/ert_improvements 
Improves ERTs
 2016-07-11 21:08:34 -04:00
TheDZD
960676d53b Merge pull request #4964 from Kyep/cryo_ghost 
Improves Cryoing
 2016-07-11 21:01:04 -04:00
TheDZD
66c8eb899e Merge pull request #4966 from Fox-McCloud/ntrep-cane 
Nanotrasen Rep Cane Tweak
 2016-07-11 20:59:34 -04:00
TheDZD
ca7530f58d Merge pull request #4968 from Fox-McCloud/blood-refactor 
Blood Refactor+Fixes
 2016-07-11 20:57:25 -04:00
TheDZD
6b047f1ac1 Merge pull request #4975 from Fox-McCloud/cinematic-fix 
Cinematic Fix and Relative Pathing
 2016-07-11 20:53:59 -04:00
TheDZD
2f9dab5f1e Merge pull request #4978 from Krausus/UhOhImSlowingDownAlternateAppearanceCodeAgain 
Actually Fixes Those Stupid Plants (By Fixing Alternate Appearances)
 2016-07-11 20:52:40 -04:00
TheDZD
1184daba8d Merge pull request #4979 from Fox-McCloud/pai-turrets 
pAIs No Longer valid Gun Turret Targets
 2016-07-11 20:48:19 -04:00
Fox McCloud
374b682bf7 Merge pull request #4990 from FlattestGuitar/pulse-stuf 
Fixes pulse shot cost.
 2016-07-11 20:46:22 -04:00