cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-01-03 14:12:29 +00:00
Code Issues Packages Projects Releases Wiki Activity
46,446 Commits 26 Branches 2 Tags
1bfb442d40cec3aa2677075df862e0d4d136feb7
Commit Graph

20846 Commits

Author SHA1 Message Date
Fox McCloud
1bfb442d40 Merge remote-tracking branch 'upstream/master' into universal-damage 2019-09-14 21:15:31 -04:00
AzuleUtama
30547d2bae Fixes 'Name' design in R&D console 2019-09-13 20:12:39 +01:00
variableundefined
5a9ede4ee1 Merge pull request #12281 from Dave-TH/health_insurance_cutbacks 
Nerfs Miners
 2019-09-13 09:34:57 -04:00
variableundefined
894ffab1ae Merge pull request #12277 from Fox-McCloud/removes-roman-armor 
Removes Real Armor from Autodrobe
 2019-09-13 08:15:46 -04:00
Dave
454ea46587 Let's be honest, the miners are going to die either way 2019-09-13 01:08:55 -04:00
variableundefined
e571d30f74 Merge pull request #12266 from Fox-McCloud/hydro-update 
Hydroponics Update: Growable Ash Flora
 2019-09-12 22:40:01 -04:00
variableundefined
9c88e72cc3 Merge pull request #12271 from AzuleUtama/nukeOpsItemTweaks 
Nuclear Operative Item Tweaks
 2019-09-12 19:49:34 -04:00
Fox McCloud
94a2861039 Removes Real Armor from Autodrobe 2019-09-12 01:07:58 -04:00
Fox McCloud
6f516d0303 Merge remote-tracking branch 'upstream/master' into ash-drake-rework 2019-09-12 00:42:34 -04:00
Fox McCloud
60c04285cf Bubblegum rework 2019-09-11 23:06:34 -04:00
variableundefined
db211cfc54 Deconflict 2019-09-11 23:00:13 -04:00
Kyep
7778c91c45 semi-mirror TG PR 46425 2019-09-11 16:13:35 -07:00
AzuleUtama
c6d846b6b6 Nuclear Operative Item Tweaks 2019-09-11 21:25:44 +01:00
Fox McCloud
59082ff21a space dragonnnn 2019-09-11 13:52:33 -04:00
Fox McCloud
7964c5f9c6 Reworks Ash Drake, Refactors Colossus, Fixes Endless Animal Attacks 2019-09-11 12:09:24 -04:00
variableundefined
bcd64e99be Merge pull request #12255 from Fox-McCloud/shards-glass-lights 
Refactors Shards, Improved Light Replacer, Adds Plasmaspear
 2019-09-11 10:10:18 -04:00
Fox McCloud
08ac93ae60 Merge pull request #12265 from TDSSS/godblood-fix 
Fix really silly mistake
 2019-09-11 06:38:47 -04:00
Fox McCloud
91d08fb1f6 garlic reagent 2019-09-11 06:33:03 -04:00
TDSSS
f02cbc4e60 [Comment redacted] 2019-09-11 12:05:47 +02:00
Fox McCloud
5e4521bc82 Hydroponics Update: Growable Ash Flora 2019-09-11 05:52:57 -04:00
TDSSS
86eb450c56 Fix really silly mistake 2019-09-11 07:48:45 +02:00
variableundefined
ee86b56d58 Merge pull request #12250 from Fox-McCloud/linda-upgrade-prep 
Refactors Atmos Air Current Pushing
 2019-09-11 01:28:55 -04:00
Fox McCloud
23a580f1ae Merge pull request #12263 from variableundefined/WoodenChairFix 
Remove normal subtype of wooden chair
 2019-09-11 01:00:41 -04:00
variableundefined
18b270cb7e Remove the structure/chair/wood/normal subtype, moving all properties to its parent. 2019-09-11 00:28:27 -04:00
variableundefined
323409f232 Merge pull request #12262 from Shadow-Quill/Plaslazerbeamgundeaththing 
Fixes plasma cutter being able to eat an infinite amount of plasma
 2019-09-10 23:03:15 -04:00
Shadow
960424903a :kappap: 2019-09-10 21:51:15 -05:00
Shadow
fda20578d1 HUNGRY HUNGRY :boxen: 2019-09-10 21:35:45 -05:00
variableundefined
bccdd15b6d Merge pull request #12259 from Ty-Omaha/revert-11733-this-has-psised-me-off-long-enough 
Revert "Adds Auto-Note for Manual Bans"
 2019-09-10 21:54:40 -04:00
variableundefined
ba3651258d Merge pull request #12261 from Terilia/headcrab-fix 
Small Headcrab fix.
 2019-09-10 21:06:41 -04:00
Terilia
11784c95e2 Headcrab fix 1 2019-09-11 01:48:53 +02:00
variableundefined
e593075332 Merge pull request #12248 from Fox-McCloud/taste-fixes-tweaks 
Fixes Some Tastes; Tweaks a Few
 2019-09-10 19:38:56 -04:00
variableundefined
5ea0a9a7e3 Merge pull request #12242 from Fox-McCloud/ports-frozen-status-effect 
Ports Frozen Status Effect
 2019-09-10 19:38:31 -04:00
variableundefined
8077e61d08 Merge pull request #12241 from SteelSlayer/admin-verb-removals 
Admin verb mega update
 2019-09-10 19:38:00 -04:00
Ty-Omaha
240cf39025 Revert "Adds Auto-Note for Manual Bans" 2019-09-10 17:00:10 -04:00
variableundefined
d649eaf378 Merge pull request #12240 from Fox-McCloud/turf-mineral-lava-update 
Lavaland Update Part 3: Fixes Megafauna Spawning, Rivers, and Turfs
 2019-09-10 07:54:08 -04:00
variableundefined
8a4bf7b05f Merge pull request #12256 from xProlithium/adminhelpCAtoTP 
CA to TP on adminpm and prayers
 2019-09-10 07:15:39 -04:00
Fox McCloud
5943ad2902 Merge remote-tracking branch 'upstream/master' into universal-damage 2019-09-10 07:09:30 -04:00
Fox McCloud
f998cb74ad then-we-shall-reforge-the-armor-from-what-remains 2019-09-10 07:03:05 -04:00
xProlithium
829d1297cf CA to TP on adminpm and prayers 
I missed changing CA to TP on these two folders.
 2019-09-10 03:38:26 -04:00
Fox McCloud
40428e47d9 Refactors Shards, Improved Light Replacer, Adds Plasmaspear 2019-09-10 03:08:44 -04:00
variableundefined
69537dd60c Port TG hitby refactor and detonation of items by projectiles 2019-09-09 22:57:31 -04:00
Fox McCloud
42564c65f3 Refactors Atmos Air Current Pushing 2019-09-09 20:11:26 -04:00
Fox McCloud
a1f85926ba fix 2019-09-09 17:55:08 -04:00
Fox McCloud
cdd5190e36 Fixes Some Tastes; Tweaks a Few 2019-09-09 17:47:26 -04:00
Fox McCloud
d4a0fb2864 Detect the Detecting Corgi Detective 2019-09-09 16:51:07 -04:00
Fox McCloud
177ac43f23 next-we-melt-the-memories-that-are 2019-09-09 16:20:04 -04:00
variableundefined
1270c56ef7 Merge pull request #12236 from Fox-McCloud/vending-machien-refactor-fix 
Refactors Vending Machines and Fixes Restocking Exploit
 2019-09-09 15:54:08 -04:00
Fox McCloud
d19961378d first-we-burn-away-the-world-that-was 2019-09-09 14:48:29 -04:00
SteelSlayer
4fb7d83595 re-add sticky ban, player_panel, increase width of ssd/afk window a bit 2019-09-09 10:12:58 -04:00
variableundefined
c94d038b53 Merge pull request #12235 from xProlithium/adminhelpCAtoTP 
Changed CA to TP link in adminhelp
 2019-09-09 09:40:26 -04:00