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

22686 Commits

Author SHA1 Message Date
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
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
Fox McCloud
f8c6b8da38 Merge pull request #4942 from TullyBurnalot/RevolverSpin 
Revolver Spinny Noisey-boo
 2016-07-08 15:08:43 -04:00
monster860
da14ffbd79 Line nutes 2016-07-08 14:53:15 -04: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
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
FreeStylaLT
b9b70b3d82 re^6-mapped conference/locker rooms, added door to secondary armory, removed biohazard and bomb disposal lockers 2016-07-08 19:10:30 +03:00
TullyBurnalot
e0118efead Fixed Fox's suggestion 
- Removed needless code
 2016-07-08 12:03:38 +01:00
Twinmold
fcfaa86ea7 Spacing 
Though, the rest of the code has no proper spacing... Hmmm...
 2016-07-08 03:40:29 -05: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
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
Kyep
c8cede8916 Tiger 2016-07-07 21:53:44 -07:00
FalseIncarnate
2b77c45694 Merge conflict fix 2016-07-08 00:46:46 -04:00
Fox-McCloud
9c3843092d fixes 2016-07-08 00:34:56 -04:00
Chakirski
2c259c4e22 Update component.dm 2016-07-07 23:13:24 -05:00
Chakirski
e789935c30 Update component.dm 2016-07-07 22:42:24 -05:00
TullyBurnalot
9821a7f757 Prescription Monocles 
- Makes monocle prescription upgradable
- Adds monocles to Loadout options
 2016-07-08 03:59:25 +01:00
Fox-McCloud
2e3d8bbbc6 Merge remote-tracking branch 'upstream/master' into hit-reactions 2016-07-07 22:50:53 -04:00
Chakirski
5e8c2599d1 What does the fox say? 2016-07-07 21:44:15 -05:00
Fox-McCloud
17be7813b8 shielded hardsuits 2016-07-07 22:39:40 -04:00
Tigercat2000
71e5344a98 Mass replace 2016-07-07 19:34:02 -07:00
TullyBurnalot
edc7b921ff Fixes boxes in evidence bags in boxes 
- Boxes no longer allowed inside evidence bags
 2016-07-08 03:28:58 +01:00
Fox McCloud
277c3216d1 Merge pull request #4797 from TheDZD/GENETICS-PLAYER-ANGRY-GENTICS-PLAYER-SMASH!!! 
Re-Adds Instability
 2016-07-07 22:26:58 -04:00
Fox McCloud
d0687d3354 Merge pull request #4907 from TullyBurnalot/BotanistAccess 
Revoked Botanist Access to Morgue
 2016-07-07 22:14:56 -04:00
TullyBurnalot
0b94dc3a54 Fied Tiger's recommendations 
- Removed needles src. Again.
- Replaced  istype(W, /obj/item/weapon/wrench) with iswrench(W)
 2016-07-08 03:03:37 +01:00
TheDZD
9cfb3dc644 Overeating is bad for you 2016-07-07 21:58:34 -04:00
TullyBurnalot
8953ea6fbf Removes needless src 
- Woops
 2016-07-08 02:57:17 +01:00
TullyBurnalot
adab2c06e0 Fixes Comfy Chair Deconstruction 
- Deconstructing Comfy Chairs now yields 2 metal sheets
 2016-07-08 02:49:15 +01:00
TheDZD
52e6df894e The Honkening 2016-07-07 21:35:19 -04:00
TullyBurnalot
018c771cf6 Adds ping noise 
- Photocopiers actually ping when copying butts
 2016-07-08 02:30:57 +01:00
TullyBurnalot
65edca1010 Adds spaces 
- Adds spaces in to_chat(H)
 2016-07-08 02:19:25 +01:00
Fox-McCloud
14cfc90ff9 TG Hit Reaction Port+Armor Fixes 2016-07-07 21:17:03 -04:00