cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-01-10 17:42:15 +00:00
Code Issues Packages Projects Releases Wiki Activity
44,013 Commits 26 Branches 2 Tags
a9fa2f32e1bf53927e425e8a97534d163578232c
Commit Graph

7958 Commits

Author SHA1 Message Date
Mark van Alphen
a9fa2f32e1 Remove infinite claw sharpening 2019-04-15 00:01:08 +02:00
Fox McCloud
112129779c Merge pull request #11280 from Ionward/mantles 
Adds suit-slot cosmetic mantles!
 2019-04-11 00:43:29 -04:00
Mark van Alphen
69aa881c39 Flashbang fix 2019-04-11 05:32:54 +02:00
Crazy Lemon
1a57f440df Merge pull request #11257 from Fox-McCloud/nations-update 
The Nations Update Everyone Deserves!
 2019-04-09 20:47:34 -07:00
Fox McCloud
879b50fa10 Merge pull request #11253 from Citinited/foamedmetal-fix 
Foamed metal fixes
 2019-04-09 22:38:37 -04:00
Ionward
ba7491fa49 cleaned up and made all mantles a child of the base mantle 2019-04-09 02:54:06 -07:00
Ionward
a792d46085 adds mantles! 3 public access ones (in default clothes vendor,) and 6 command ones, each in their respective heads' lockers. 2019-04-09 01:06:19 -07:00
Fox McCloud
03d894ecfc Merge remote-tracking branch 'upstream/master' into fix-cqc 
# Conflicts:
#	code/game/objects/items.dm
 2019-04-07 19:54:14 -04:00
variableundefined
7416eebf7f Merge pull request #11265 from Fox-McCloud/fix-pill-bottles 
Fixess Being Unable to Open Pill Bottles
 2019-04-07 22:12:01 +08:00
Fox McCloud
c0ca397d8a Fixess Being Unable to Open Pill Bottles 2019-04-07 09:25:45 -04:00
variableundefined
ff8dc59367 Merge pull request #11229 from Fox-McCloud/reagent-tweaks 
[Goonchem] Reagent tweaks
 2019-04-07 21:22:18 +08:00
variableundefined
34f7e3dc9f Merge pull request #11251 from Fox-McCloud/vending-machine-qol 
Vending Machine QOL and Destruction
 2019-04-07 21:18:43 +08:00
variableundefined
53d64d818d Merge pull request #11225 from TDSSS/box-revolver 
Trick revolver comes in a box.
 2019-04-07 21:14:51 +08:00
Fox McCloud
8cf68e7cae Fixes Russian Revolver 2019-04-07 07:37:02 -04:00
Fox McCloud
8446632fbc The Nations Update Everyone Deserves! 2019-04-06 20:30:04 -04:00
Citinited
9f8099637a Foamed metal will no longer turn transit turfs into metal floors; fixes foamed metal floors not having a sprite 2019-04-06 20:48:00 +01:00
Fox McCloud
9bbe5b1887 Vending Machine QOL and Destruction 2019-04-06 06:08:04 -04:00
Fox McCloud
638c225397 Merge pull request #11140 from dovydas12345/Statues 
Removes a unneeded dot from diamond statue names
 2019-04-06 03:14:58 -04:00
Fox McCloud
282350fb71 Tweaks Foam and Pyrotechnics 2019-04-04 05:06:39 -04:00
variableundefined
cc831667cd Merge pull request #11081 from Kyep/hijack_limits 
Syndie Uplink changes (better interface, hijack-only firegrenades)
 2019-04-04 09:30:56 +08:00
TDSSS
2ba5ec0228 fake revolver kit creation 2019-04-03 20:43:55 +02:00
AzuleUtama
3bbfcc8755 Cleans up some uplink code for showing descriptions 2019-04-02 20:36:52 +01:00
variableundefined
a552137e07 Merge pull request #11190 from Fox-McCloud/flash-sonic-bang 
Flash Powder, Sonic Powder, and Flashbang Refactor
 2019-04-02 20:33:17 +08:00
variableundefined
58f253ad33 Merge pull request #11156 from farie82/big-wrapper-fix 
Wrapping big objects and welding lockers now takes time
 2019-04-02 18:34:05 +08:00
variableundefined
449baf808b Merge pull request #11170 from Fox-McCloud/trick-revolver 
Adds Trick Revolver
 2019-04-02 18:33:24 +08:00
variableundefined
bb14880f66 Merge pull request #11198 from Fox-McCloud/Ohhhhhhhhhhhhhh-sssssshiiittttt-antttttssssss 
OHHHH SHITTTT ANTTTSSS
 2019-04-02 18:26:26 +08:00
Fox McCloud
0b06a32cc9 Merge pull request #11165 from Markolie/issues 
Resolve some issues that the compiler doesn't spot
 2019-04-01 18:22:43 -04:00
Mark van Alphen
8cdb41b835 Switch around random calls 2019-04-01 18:29:01 +02:00
Mark van Alphen
d1f8adc724 Fix infinite loop in safes 2019-04-01 18:26:58 +02:00
Fox McCloud
6fadf083d7 OHHHH SHITTTT ANTTTSSS 2019-04-01 01:27:49 -04:00
Fox McCloud
cbcc4aab45 Flash Powder, Sonic Powder, and Flashbang Refactor 2019-03-31 03:29:27 -04:00
Fox McCloud
f70ecb4387 Adds Trick Revolver 2019-03-29 23:33:46 -04:00
Mark van Alphen
b8e840c094 Resolve some issues that the compiler doesn't spot 2019-03-29 16:21:15 +01:00
variableundefined
e6ef2e9bbc Merge pull request #11151 from Fox-McCloud/suicide-refactor 
Suicide Refactor
 2019-03-29 20:49:18 +08:00
variableundefined
0822830491 Merge pull request #11131 from farie82/handcuff-1-hand 
You can cuff people with atleast one hand now + refactor of handcuff code
 2019-03-29 19:23:37 +08:00
joep van der velden
7f8837723f target dun exist and user 2019-03-29 09:05:30 +01:00
joep van der velden
591b6b093f spacing 2019-03-28 23:29:36 +01:00
joep van der velden
b8a414a5c4 Also welding takes time now + usr 2019-03-28 23:26:57 +01:00
Fox McCloud
d0ea5ee8b9 Crit Rework Final Submission 2019-03-28 17:28:00 -04:00
Fox McCloud
a8dc5770db whoops 2019-03-27 23:09:21 -04:00
Fox McCloud
814e492a55 Suicide Refactor 2019-03-27 22:54:26 -04:00
Dovixx
1e388140e7 Change it 2019-03-26 18:59:53 +02:00
joep van der velden
cc8e076ae5 alternative. 1 handed cuffing 2019-03-25 20:19:42 +01:00
variableundefined
8d52d56cc7 Merge pull request #11123 from Fox-McCloud/flare-fix 
Fixese Flares not Returning a qdel hint
 2019-03-25 08:14:05 +08:00
Fox McCloud
46fdd6c466 Fixese Flares not Returning a qdel hint 2019-03-24 19:57:34 -04:00
Fox McCloud
ae7a141d28 fixes smoke 2019-03-24 18:44:01 -04:00
joep van der velden
51feae1354 fixed the borg handcuffing being inconsistent and did some refactoring 2019-03-24 22:28:07 +01:00
Fox McCloud
1d0cdbe8a9 fix this too 2019-03-24 17:04:48 -04:00
variableundefined
ec46fdc510 Merge pull request #11090 from Tails2091/Animal_Sounds 
Added Emotes and Sounds to Corgis and Cats. Moved Animal Sounds to Creature Folder.
 2019-03-24 17:55:01 +08:00
variableundefined
85ab7a8b06 Merge pull request #11065 from Fox-McCloud/pill-bottles-and-patch-packs 
[Goonchem] Pills, Bottles, Patches, and Pillbottles
 2019-03-24 17:51:00 +08:00