cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2025-12-29 19:52:12 +00:00
Code Issues Packages Projects Releases Wiki Activity
28,874 Commits 26 Branches 2 Tags
4fa956054caee5fd20dc58aaa78bf35adfbb9687
Commit Graph

22230 Commits

Author SHA1 Message Date
Fox McCloud
4fa956054c Merge pull request #4959 from TheDZD/salt-for-the-salt-god 
Adds "salts" to the Say Verbs for Deadchat
 2016-07-10 19:10:54 -04:00
Fox McCloud
a8da06536c Merge pull request #4977 from FlattestGuitar/grenade-launchers 
Fixes the m90 grenade launcher.
 2016-07-10 15:51:08 -04:00
Mieszko Jędrzejczak
593aaee243 :^] 2016-07-10 21:43:56 +02:00
Fox McCloud
a61a2bdb53 Merge pull request #4973 from monster860/health_scanner_fix 
Fixes health scanner not having closing tag on it
 2016-07-10 15:38:54 -04:00
Fox McCloud
7fad1c9479 Merge pull request #4976 from monster860/alert_fix 
Fixes #4974
 2016-07-10 15:38:33 -04:00
monster860
dfcb4ce1d1 Fixes alerts 2016-07-10 15:30:36 -04:00
monster860
3552ed9608 Fixes health scanner not having closing tag on it 2016-07-10 14:38:09 -04:00
TheDZD
a97f0eaeea Merge pull request #4952 from Fox-McCloud/borg-power 
Borg Power Use Refactor
 2016-07-10 14:23:37 -04:00
monster860
009dcaa2d8 Merge branch 'master' into w_class 2016-07-10 09:29:12 -04:00
Fox-McCloud
e0b50cd87a tweak 2016-07-09 22:21:28 -04:00
TheDZD
0617cad287 Merge pull request #4944 from Fox-McCloud/cursed-heart 
Ports TG's Cursed Hearts
 2016-07-09 21:02:31 -04:00
Fox McCloud
88a0482d27 Merge pull request #4688 from FreeStylaLT/maintgoodies 
Adds a bunch of items to maint, Syndicate contraband included, tweaks probabilities.
 2016-07-09 20:51:40 -04:00
FreeStylaLT
2140d9168a removes dank trays from list 2016-07-10 03:40:05 +03:00
Fox McCloud
bf07402fb9 Merge pull request #4948 from TullyBurnalot/DroneFix 
Drone AntagHUD Fix
 2016-07-09 18:55:39 -04:00
Fox McCloud
f20ac43730 Merge pull request #4909 from TullyBurnalot/PAEPERVERK 
Admin Fax Template Flair
 2016-07-09 18:54:32 -04:00
Fox McCloud
7ca21d2f91 Merge pull request #4953 from Krausus/JobBanRefactor 
Job Ban Check Refactor
 2016-07-09 18:36:41 -04:00
Fox McCloud
443e530f08 Merge pull request #4923 from TullyBurnalot/PhotocopyEmag 
Photocopier Emagging and Toast
 2016-07-09 18:32:55 -04:00
Fox McCloud
a8d010360c Merge pull request #4946 from TullyBurnalot/RevenantFix 
Revenant Death Fix
 2016-07-09 18:31:39 -04:00
Fox McCloud
276160ef8f Merge pull request #4928 from TullyBurnalot/Monocle! 
Prescription Monocles
 2016-07-09 18:31:16 -04:00
TheDZD
04d5219d6a Merge pull request #4929 from Fox-McCloud/hit-reactions 
Hit reactions
 2016-07-09 18:30:37 -04:00
Fox McCloud
c98ba8de79 Merge pull request #4925 from TheDZD/no-looking-back-no-regrets 
The Honkening
 2016-07-09 18:29:11 -04:00
Fox-McCloud
6a45502dd9 proper RD armor 2016-07-09 18:18:52 -04:00
TheDZD
306f1a8e2d Ghosts for the ghost throne 2016-07-09 17:58:39 -04:00
TullyBurnalot
36e9f46c0f Fixed typo in "proffesionalism" 
IRONY
 2016-07-09 17:25:58 +01:00
TullyBurnalot
78547e275a - Added two more fax templates 
- Added "Keep up the good work" template
- Added "ERT Instructions" template
 2016-07-09 16:38:14 +01:00
TheDZD
a144980bde Minor tweaks 2016-07-09 11:37:26 -04:00
Krausus
918ed392bd Job ban refactors/fixes 2016-07-09 06:05:07 -04:00
Fox McCloud
cb26d1eb00 Merge pull request #4943 from Tastyfish/healthfix 
Makes human's healthdoll immediately update upon health being changed
 2016-07-09 04:38:54 -04:00
Fox-McCloud
405df28fab Borg Power Use Refactor 2016-07-09 01:50:26 -04:00
TullyBurnalot
a0a95ca28a - Replaced "return 0" with "continue" 
Should be fine now.
 2016-07-09 05:03:55 +01:00
TullyBurnalot
14ec113bbd Fixes Drone AntagHUD issue 
- Activating Antag HUD will now stop you from being a viable candidate
for repaired maintenance drones
 2016-07-09 04:30:25 +01:00
TullyBurnalot
9775cf9ec4 Revenants can die now 
- Removed "You can't die if you just died" insanity
 2016-07-09 03:49:47 +01:00
Fox McCloud
d9c86e24ed Merge pull request #4922 from FalseIncarnate/kitchen 
Buildable Deep Fryers
 2016-07-08 21:19:02 -04:00
Fox-McCloud
9544d8409f Ports TG's Curesed Hearts 2016-07-08 20:51:08 -04:00
Tastyfish
37d2721c76 Makes healthdoll immediately update upon being hit 2016-07-08 19:28:07 -04:00
Fox McCloud
33c4d852f8 Merge pull request #4904 from TullyBurnalot/CardboardCoffins 
Resisting out of cardboard boxes is now possible
 2016-07-08 18:24:18 -04:00
Fox McCloud
c07a4e7c7e Merge pull request #4919 from Krausus/AltAppearanceFixes 
Alternate Appearance Fixes
 2016-07-08 18:02:01 -04:00
Fox McCloud
699c7586c7 Merge pull request #4918 from Chakirski/EMP-Binary 
Adds disable_component() to Cyborgs - EMPs Disable Binary
 2016-07-08 18:01:08 -04:00
Fox McCloud
ec40944987 Merge pull request #4921 from Chakirski/green-glasses 
Prescription Upgrade to Green Glasses & Syndi-Mesons
 2016-07-08 18:00:27 -04:00
Fox McCloud
4f8de18cb9 Merge pull request #4936 from Twinmold93/materialconsistencies 
Grille  Inconsistency Fix
 2016-07-08 17:59:23 -04:00
Fox McCloud
f8c6b8da38 Merge pull request #4942 from TullyBurnalot/RevolverSpin 
Revolver Spinny Noisey-boo
 2016-07-08 15:08:43 -04:00
Chakirski
edda2a8cfc operator_changes 2016-07-08 13:37:29 -05:00
TullyBurnalot
b79429ca8a Fixes Revolver Sound 
- Spinning revolvers now produces a sound.
 2016-07-08 19:20:33 +01:00
Fox McCloud
4897a52dc5 Merge pull request #4926 from TullyBurnalot/ComfyChair 
Fixes Comfy Chair Deconstruction
 2016-07-08 13:14:51 -04:00
monster860
3df85518e1 Removes .0 at the end of w_class numbers 2016-07-08 12:26:34 -04:00
TullyBurnalot
e0118efead Fixed Fox's suggestion 
- Removed needless code
 2016-07-08 12:03:38 +01:00
Twinmold
cd7ffd058b Grille Inconsistency Fix 
This fixes an inconsistency when you use wirecutters on a destroyed
grille. Instead of giving 1 like it should, it gives two.

🆑 Twinmold
Fix: Fixes the inconsistency of getting 2 metal rods when you wirecutter
a destroyed grille down to 1.
/🆑
 2016-07-08 03:29:16 -05:00
Chakirski
7b61546f98 Tabtest-tabtab-testtab 2016-07-08 01:16:51 -05:00
Fox McCloud
0c9965abf8 Merge pull request #4927 from TullyBurnalot/BawksInBawks 
Fourth-Dimensional Box Tesseract Fix
 2016-07-08 01:24:32 -04:00
FalseIncarnate
2b77c45694 Merge conflict fix 2016-07-08 00:46:46 -04:00