cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-01-19 14:02:26 +00:00
Code Issues Packages Projects Releases Wiki Activity
33,953 Commits 27 Branches 2 Tags
36f9727d4d0dcd6380b05d8a7604e795b8aebc95
Commit Graph

1221 Commits

Author SHA1 Message Date
Fox McCloud
a890444f2f Merge pull request #7247 from Aurorablade/FiftyShadesOfGrey 
Fifty shades of grey
 2017-05-09 01:07:47 -04:00
Fox McCloud
467cb541ac Merge pull request #7157 from SamHPurp/clown-abuse 
Removes a disgusting hack
 2017-05-07 17:47:59 -04:00
Aurorablade
2524f56928 urgh so many 2017-05-07 02:01:08 -04:00
Sam
7283274dd7 Github editor, how I hate thee 
let me count the ways
 2017-05-07 00:34:11 +01:00
Aurorablade
e7f612eda0 Adds Tajaran Veil Clothing Racial Item (#7225) 
* Initial commit Squashed

* hideeyes

* false changes

* coverseyes
 2017-05-06 15:44:59 -07:00
FlattestGuitar
764e813116 NT rep plasma suit (#7230) 2017-05-06 13:58:18 -07:00
Sam
a28a7a4da5 Updates to check to ensure they are clowns, not imposters 2017-05-02 07:44:23 +01:00
Sam
4a86f2f34a Removes a disgusting hack 2017-04-23 10:09:50 +01:00
Crazy Lemon
e7abc43dd8 Merge pull request #7122 from Spacemanspark/hoodie-of 
Permits hoodies to carry flashlights
 2017-04-20 21:23:21 -07:00
Mark van Alphen
d786a78e2e Merge branch 'master' into findnreplace 2017-04-19 20:41:05 +02:00
Tom Heeren
2f7f2af5eb Re-adds the ability to carry oxygen tanks on your hoodie. 
Oops.
 2017-04-19 00:37:46 -05:00
Tom Heeren
0451546231 Permits hoodies to carry flashlights 2017-04-17 22:12:19 -05:00
Fox McCloud
db18224eb0 Merge pull request #7090 from ZomgPonies/superheroes2 
Superheroes update
 2017-04-16 17:48:52 -04:00
Markolie
d9653c79f5 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into findnreplace 
# Conflicts:
#	code/game/machinery/recharger.dm
#	code/game/objects/items/devices/autopsy.dm
#	code/game/objects/items/devices/modkit.dm
#	code/game/objects/structures/lattice.dm
 2017-04-14 18:15:12 +02:00
Xantholne
b4044b7dd7 Changes beret color to a medical doctor uniform white. Removes certain jobs that probably wouldn't be given one as well. Also updates the flavor text to not be about a blue beret. 2017-04-14 08:13:42 -06:00
Xantholne
991f331aaf Adds Medical beret available via loadout 2017-04-12 23:50:07 -06:00
ZomgPonies
06ba71d003 Superheroes update 2017-04-11 19:53:08 -04:00
Crazy Lemon
ff271f7b29 Merge pull request #7061 from Fox-McCloud/damn-cells 
Damn cells
 2017-04-09 13:55:30 -07:00
Crazy Lemon
cc649db525 Merge pull request #6894 from Fox-McCloud/abductor-hearts 
Abductor Gland Rework and Abductor Updates
 2017-04-09 13:40:01 -07:00
Fox-McCloud
5631d36ff8 Converts Most Destroys to use QDEL_NULL 2017-04-04 23:08:41 -04:00
Crazy Lemon
c6abe7822b Merge pull request #6961 from Fox-McCloud/garbage-collect-stuffs 
Garbage Collection and Code Cleanup
 2017-04-01 22:58:52 -07:00
Fox-McCloud
35ab7ada94 Refactors Cell Energy Values 2017-04-01 20:14:29 -04:00
Mark van Alphen
2d1c04c112 Merge branch 'master' into findnreplace 2017-04-01 23:51:58 +02:00
Fox-McCloud
838d58b1a5 for fixes 2017-03-28 01:06:03 -04:00
Fox McCloud
4d18372353 Merge pull request #6925 from SamHPurp/fixes-abductors 
Refactors Stool/Bed/Chair deconstruction + adds Psych's bed recipe + bug fixes
 2017-03-27 04:33:30 -04:00
Sam
8965ba9872 Misc grammatical fixes 
Adds message to let people know when you're trying to yank out objects
from them
 2017-03-27 06:16:24 +01:00
Sam
0b7a95933c Refactors bed/chair/stool deconstruction + more 
Add psych bed... fixes typos... fixes inconsistent deconstruction
amounts
 2017-03-26 15:50:49 +01:00
FlattestGuitar
4445a34650 Merge branch 'master' into outfiterinos 2017-03-25 21:20:51 +01:00
FlattestGuitar
c0ac235704 Touching up the admin outfits... 2017-03-25 18:45:36 +01:00
Mark van Alphen
cd78336ab8 Merge branch 'master' into findnreplace 2017-03-25 00:11:39 +01:00
Fox-McCloud
01466c02dc Abductor Gland Rework 2017-03-23 02:33:00 -04:00
Fox McCloud
d62e35d333 Merge pull request #6647 from Kyep/nerf_chaplain 
Nerfs Validhunting Chaplains
 2017-03-23 00:18:16 -04:00
Fox McCloud
31f6bb205a Merge pull request #6814 from Jovaniph/evaspriteupdate 
Tajaran EVA Suit Sprites and Minor Updates
 2017-03-20 16:41:59 -04:00
KasparoVy
467c7fa1ae Fixes Glovesnipping 
Attempting to snip gloves runtimed out because of that accidental
shift-key period business. Works again.
 2017-03-20 05:34:25 -04:00
Jovan
9aed97a244 Tajaran EVA Suit and some updates 2017-03-18 21:29:39 -04:00
Jovan
3fde1afd65 Vox hats yaya 2017-03-18 04:20:56 -04:00
Fox McCloud
b964485e08 Merge pull request #6785 from Jovaniph/unathieva 
Unathi EVA Suit
 2017-03-17 08:57:12 -04:00
Jovan
af62b3f3a7 Unathi EVA Suit 2017-03-16 08:25:52 -04:00
FlattestGuitar
603668fb23 Adds winter boots; adds workboots to the loadout system 2017-03-15 19:45:40 +01:00
Mark van Alphen
06b3460d6e Merge branch 'master' into findnreplace 2017-03-15 16:02:14 +01:00
Fox McCloud
c6e3fe3cdb Merge pull request #6734 from uraniummeltdown/plastic 
Plastic is not a mineral anymore, plastic flaps can be constructed/deconstructed
 2017-03-15 06:33:02 -04:00
uraniummeltdown
85260a72ba plastic is not a mineral anymore, plastic flaps are deconstructible, new construction.dm construction defines 2017-03-12 06:09:29 +04:00
Jovan
65cb35fbb2 please no merge conflict. 2017-03-11 19:21:06 -05:00
Jovan
48caf853d5 forgot other file yaya 2017-03-11 16:51:04 -05:00
Jovan
f1188c0ecc Merge branch 'master' of https://github.com/ParadiseSS13/Paradise.git into vulpevasuit 2017-03-11 16:45:02 -05:00
Jovan
22db913d9f conflict fixing. 2017-03-11 05:08:19 -05:00
Jovan
054a4ce3f1 Merge Fix? 2017-03-11 05:05:49 -05:00
Fox McCloud
3c7d990061 Merge pull request #6710 from uraniummeltdown/coverflags 
Cleaned up clothing flags
 2017-03-11 04:57:15 -05:00
Jovan
19a44e7172 added vulpkanin eva suit 2017-03-11 02:09:16 -05:00
uraniummeltdown
04368ef0c5 removes Vox EVA suits, adds sprite_sheets and sprite_sheets_obj to regular EVA suits, added 2 more EVA suits to map in place of Vox ones 2017-03-11 10:39:56 +04:00