cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-06-24 06:44:02 +01:00
Code Issues Packages Projects Releases Wiki Activity
43,852 Commits 12 Branches 2 Tags
8d91925e1f3e7c5f8a5ecf58fa8f9bdda2befad0
Commit Graph

19652 Commits

Author SHA1 Message Date
Mark van Alphen a21ec0f30b Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs 
# Conflicts:
#	code/modules/mob/living/simple_animal/hostile/hostile.dm
 2019-04-04 22:04:55 +02:00
Mark van Alphen 33d6017e28 Merge branch 'turfs' of https://github.com/Markolie/Paradise into turfs 2019-04-04 22:01:50 +02:00
Mark van Alphen 877cfc4d7d Refactor catwalks to not be floors, update chasms and fix Lavaboat 2019-04-04 22:01:25 +02:00
Mark van Alphen d077138c3d Merge pull request #4 from CornMyCob/turfs 
blood drunk miner
 2019-04-04 21:41:45 +02:00
CornMyCob e02087d474 blood drunk miner 2019-04-04 20:34:26 +01:00
Mark van Alphen 99c470531f Add Swarmer megafauna/ruin, refactor medals so it's a subsystem. The catwalk's not yet functional 2019-04-04 17:43:15 +02:00
Mark van Alphen ddd845f01a Improve slot accessory handling 2019-04-03 22:50:34 +02:00
Mark van Alphen 731bc60958 Merge pull request #3 from CornMyCob/turfs 
Stuff
 2019-04-03 22:28:17 +02:00
CornMyCob ec6fa51091 accessories 2019-04-03 20:34:58 +01:00
CornMyCob 7eb4277a01 MORE UPDATES! 2019-04-03 20:29:16 +01:00
Mark van Alphen 19b923c999 Ash Walker/Gutlunch fixes. Glass containers now do not splash on help intent, for milking. 2019-04-03 17:24:55 +02:00
Crazy Lemon 014b3404b6 Merge pull request #11216 from Fox-McCloud/fix-mob-performance 
Fixes Mob Performance Issue
 2019-04-02 18:09:24 -07:00
Fox McCloud 4a74ea8fea Fixes Mob Performance Issue 2019-04-02 20:34:48 -04:00
variableundefined 5dbc9647a8 Merge pull request #11210 from farie82/deathnettle-fix 
Fixes deathnettle not being able to be picked up
 2019-04-03 07:05:32 +08:00
Crazy Lemon e2a9d0556f Merge pull request #11211 from Fox-McCloud/fix-the-thing 
Fixes Some Species Having Oxy Damage
 2019-04-02 15:49:48 -07:00
Fox McCloud a7cc99ecf7 Merge pull request #11179 from Ty-Omaha/grid-check 
Adds super cool powerloss sound to grid check event
 2019-04-02 18:16:15 -04:00
CornMyCob 9f5b3fc796 updates 2019-04-02 20:26:23 +01:00
Fox McCloud 4b444860fd Fixes Some Species Having Oxy Damage 2019-04-02 14:25:29 -04:00
joep van der velden bba407c889 fixed deathnettle 2019-04-02 20:16:46 +02: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
Fox McCloud 43338beffe Merge pull request #11126 from Arkatos1/Syndie_Borg_Medibeam 
Adds Medical Beamgun to a Syndicate Medical Cyborg
 2019-04-02 07:19:52 -04: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 e0fc454634 Merge pull request #11168 from KasparoVy/blind_as_a_vox 
Updates Vox-Fitted Blindfold, Adds Taj Veil Sprites & Removes Stray Pixel
 2019-04-02 18:33:37 +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 b208f7c17f Merge pull request #11177 from Ty-Omaha/Meaningful-Alerts 
Makes "Start Now"'s confirmation meaningful
 2019-04-02 18:30:43 +08:00
variableundefined b7c787b113 Merge pull request #11199 from Fox-McCloud/fixes-bees 
Fixes Bees
 2019-04-02 18:26:45 +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 49a1569eaa Merge pull request #11117 from farie82/fixe-antidrop-and-resting-issue 
Fixes some antidrop edge cases and can't give items to resting people now
 2019-04-01 19:50:48 -04: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
Fox McCloud 2bbba89480 Merge pull request #11169 from Arkatos1/Blob_QoL_Update 
Blob QoL Update and Rebalance
 2019-04-01 18:11:37 -04:00
Fox McCloud ce1f6d4424 Merge pull request #11202 from dovydas12345/AI-anchor 
Fixes AI's ability to toggle floor bolts
 2019-04-01 17:54:36 -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
farie82 2922578c6b no more \the 2019-04-01 23:31:46 +02:00
Mark van Alphen 5c1ac0cb82 Add mapload to shuttle computer Initialize 2019-04-01 23:30:40 +02:00
Fox McCloud 860ac8010f Merge pull request #11139 from farie82/bluespace-golem-fix 
Adds a restraint on the casting of the bluespace golem teleport
 2019-04-01 17:27:39 -04:00
Fox McCloud a2842652e0 typecache for wants objects 2019-04-01 17:11:56 -04:00
Fox McCloud e487b8b58e gosh dang 2019-04-01 16:22:20 -04:00
Dovixx cfa64189cc Update 2019-04-01 19:59:11 +03:00
Mark van Alphen 57366118af Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs 2019-04-01 17:55:37 +02:00
variableundefined b0f64016a9 Merge pull request #11158 from Fox-McCloud/delayed-gibbing 
Makes Delayed Gibbing a Proc
 2019-04-01 23:07:17 +08:00
variableundefined 1bb7cf9807 Merge pull request #11159 from Ty-Omaha/sounds 
Changes Gamma and Epsilon security level sounds
 2019-04-01 23:06:56 +08:00
variableundefined 06a9770ae4 Merge pull request #11157 from Fox-McCloud/chem-master-refactor 
ChemMaster Refactor
 2019-04-01 23:06:42 +08:00
Fox McCloud 3e9e057a1a Fixes Bees 2019-04-01 03:16:21 -04: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 55adce2fb1 Fix code review issues 2019-03-31 22:09:09 +02:00
Mark van Alphen 1619bc048b Lavaland baseturf implementation 2019-03-31 22:07:30 +02:00