cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-06-07 14:33:24 +01:00
Code Issues Packages Projects Releases Wiki Activity
48,775 Commits 15 Branches 2 Tags
4cc30536605ba8dcafe31e6a9be9d0e40e6091c8
Commit Graph

8705 Commits

Author SHA1 Message Date
CornMyCob 7eb4277a01 MORE UPDATES! 2019-04-03 20:29:16 +01: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
CornMyCob 9f5b3fc796 updates 2019-04-02 20:26:23 +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
Mark van Alphen 500675be77 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs 
# Conflicts:
#	code/game/objects/structures/safe.dm
 2019-04-02 00:54:49 +02: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 3f6f4555d7 Minor Lavaland item fixes 2019-04-01 23:51:41 +02:00
Mark van Alphen f75de97c6e Port over Corn and affected's work on Lavaland 
Co-authored-by: AffectedArc07 <josephcase55@hotmail.com>
Co-authored-by: CornMyCob <xxxxbarryscottxxxx@gmail.com>
 2019-04-01 23:41:32 +02:00
Mark van Alphen c8cf58b341 Temporarily add the safe fix here, too 2019-04-01 19:47:31 +02: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
Mark van Alphen 935449fb39 Remove duplicate suit, other minor fixes 2019-04-01 03:51:42 +02:00
Mark van Alphen ed153d3566 Add seed vault and animal hospital 2019-03-31 23:49:18 +02:00
Mark van Alphen 1619bc048b Lavaland baseturf implementation 2019-03-31 22:07:30 +02:00
Mark van Alphen 1689e46f1e Added Syndicate base and ported over turf decals 2019-03-31 20:26:02 +02:00
Fox McCloud cbcc4aab45 Flash Powder, Sonic Powder, and Flashbang Refactor 2019-03-31 03:29:27 -04:00
Mark van Alphen bf68f966b1 Add Ash Walkers, work on Syndicate base 2019-03-31 04:33:39 +02:00
Mark van Alphen 45a066c7d1 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs 
# Conflicts:
#	code/modules/food_and_drinks/recipes/recipes_grill.dm
 2019-03-30 22:55:09 +01:00
Mark van Alphen f92be2c67d Add Beach biodome ruin and other fixes 2019-03-30 22:48:11 +01:00
Mark van Alphen e1b18e07c6 Fix temporary visuals 2019-03-30 06:15:07 +01:00
Mark van Alphen 7149dd6aad Goliath improvements 2019-03-30 05:20:27 +01:00
Fox McCloud f70ecb4387 Adds Trick Revolver 2019-03-29 23:33:46 -04:00
Mark van Alphen c370e08233 Port the actual Lavaland map (and associated fixes) 2019-03-30 04:12:37 +01:00
Mark van Alphen fb337f2825 Port over Lavaland mobs and turfs (not finished) 2019-03-29 23:45:36 +01: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
variableundefined 4ca33bb19d Merge pull request #11078 from Fox-McCloud/goonchem-reagent-temperature 
[Goonchem] Reagent Temperature and Pyrotechnics
 2019-03-24 17:50:07 +08:00
variableundefined a34c8dda8f Merge pull request #11076 from AzuleUtama/syndieMedBagChanges 
Removes MMI from uplink surgery kit - makes it a separate purchase for Roboticists
 2019-03-24 17:47:02 +08:00
Fox McCloud d33e09fdc4 Merge pull request #11103 from farie82/holo-firelock-fix 
Fixes a few atmos bugs when structures get destroyed/removed
 2019-03-24 03:16:42 -04:00