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

13925 Commits

Author SHA1 Message Date
Kyep
35de9d2d69 Changed exile implants locker to armory access 2016-07-09 17:38:02 -07:00
monster860
aa51c925ea The Long-Requested Nano-UI-ification of the ChemMaster 2016-07-09 20:34:57 -04: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
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
TheDZD
306f1a8e2d Ghosts for the ghost throne 2016-07-09 17:58:39 -04:00
Mieszko Jędrzejczak
e1275c8a79 *sigh 2016-07-09 22:22:53 +02:00
Mieszko Jędrzejczak
037b149eda removes duplicate uniforms 2016-07-09 22:13:52 +02:00
Mieszko Jędrzejczak
30299a0b6b hon hon, mon ami! 2016-07-09 21:56:17 +02:00
Crazylemon64
ad1f67c9f9 Spaces to tabs 2016-07-09 11:57:56 -07: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
TullyBurnalot
9b614a9df0 - Changed atom_say_verb 
Photocopiers now "bleep" rather than "say"
 2016-07-09 16:00:49 +01:00
Krausus
918ed392bd Job ban refactors/fixes 2016-07-09 06:05:07 -04:00
Mieszko Jędrzejczak
5745099842 birb. 2016-07-09 11:24:00 +02: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
Twinmold
5888b6f003 Moves Check to human_attackhand.dm 
Moves the check from sleeping_carp.dm to human_attackhand.dm, and puts
vampire bite as priority over martial arts when aimed at the head.
 2016-07-09 03:04:07 -05: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
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
TullyBurnalot
52cc7786c0 - Replaced visible_message with atom_say 
What the title says
 2016-07-09 01:27:34 +01:00
Tastyfish
37d2721c76 Makes healthdoll immediately update upon being hit 2016-07-08 19:28:07 -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
Chakirski
8f23ac930a Revert "sync" 
This reverts commit 3700a7ff8b.
 2016-07-08 15:42:15 -05:00
Chakirski
3700a7ff8b sync 2016-07-08 15:33:26 -05:00
Chakirski
3a3f7e7218 Revert "Merge branch 'BACON!' of https://github.com/Chakirski/Paradise into BACON!" 
This reverts commit 5d0cf2b3f8, reversing
changes made to b7897435c3.
 2016-07-08 15:08:37 -05:00
Chakirski
d432cf1239 Pink bacon 2016-07-08 14:58:46 -05:00
monster860
94c1a4e08e Merge branch 'master' into vg-parallax 2016-07-08 14:51:30 -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
Mieszko Jędrzejczak
8344cb0e2a Adds pants, pants. 2016-07-08 19:42:57 +02:00
monster860
3df85518e1 Removes .0 at the end of w_class numbers 2016-07-08 12:26:34 -04:00
Twinmold
fcfaa86ea7 Spacing 
Though, the rest of the code has no proper spacing... Hmmm...
 2016-07-08 03:40:29 -05:00
Twinmold
44ff7482f9 The Sleeping Carp Vampires 
There is a small chance someone who is a vampire will also get traitor,
or vice versa. If they get the martial art scroll (sleeping carp), they
are unable to harm intent the head to drink their blood anymore. This
makes it so they can if they have sleeping carp.
 2016-07-08 02:59:18 -05:00
FalseIncarnate
3f4d2911f7 List commit 
Changes the previous hardcoded slots to use lists as suggested by
Krausus. I was just too convinced I did it right to realize what he
meant initially.
 2016-07-08 03:20:19 -04:00
Crazylemon64
a779fc8663 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into space_ruins 
All hail glorious leader tigercat
 2016-07-08 00:16:28 -07:00
Crazylemon64
20eee9064c Fixes init on various things, as well as allowing the 
map loader to safely load templates mid-run
 2016-07-07 23:52:44 -07:00
Chakirski
7b61546f98 Tabtest-tabtab-testtab 2016-07-08 01:16:51 -05:00
Chakirski
f2cf93226e Amazing! 2016-07-08 00:26:37 -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
Kyep
dd8897fd22 Fixes merge conflict 2016-07-07 21:57:42 -07:00