cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-20 18:47:20 +01:00
Code Issues Packages Projects Releases Wiki Activity
63,724 Commits 17 Branches 2 Tags
dependabot/github_actions/actions/setup-python-7.0.0
Commit Graph
1961 Commits
Author SHA1 Message Date
Markolie 61daab92f2 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into lavaland_megafauna 
# Conflicts:
#	code/modules/mob/living/carbon/human/appearance.dm
 2016-10-25 18:31:39 +02:00
Markolie e5c4b78f47 Add Colossus, add outdoors variable to areas and update fireball targeting 2016-10-25 04:10:52 +02:00
Markolie f61cfb47b9 Part three: The Hierophant. Also minor fixes for the other bosses. 2016-10-24 21:39:40 +02:00
Fox McCloudandGitHub 45ba4d157a Merge pull request #5416 from KasparoVy/tail_markings_mark2 
Marking Refactor, Adds tail markings + Alt heads + Secondary (F)Hair themes, Darkens Vulp/Taj + Unathi horns/frills, Sprite adjustments and more...
 2016-10-23 19:29:54 -04:00
Markolie 2e711d1337 Lay groundwork for megafauna, and add Ashdragon. 
Includes a refactor for gun turrets (merged into portable turrets), hostile simple_animal behaviour, spells (sounds have been added) and poi_list items.
 2016-10-23 23:15:57 +02:00
Aurorablade 01f4e64f12 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into DWI 2016-10-12 20:37:09 -04:00
TheDZDandGitHub 568e648bfb Merge pull request #5581 from Fox-McCloud/cloning-update 
Cloning Update
 2016-10-11 16:51:34 -04:00
Aurorablade 864a9ba612 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into DWI 2016-10-07 23:51:48 -04:00
Kyep 7e613798b0 Fixes merge conflict in admin_verbs.dm 2016-10-01 13:26:24 -07:00
Aurorablade ee1482b9b2 THE HACKS HURTS US PRECIOUS 2016-09-27 01:06:48 -04:00
Mieszko Jędrzejczak 56d56ffe7f ckeyless humans don't get to be shot 2016-09-26 17:43:57 +02:00
uraniummeltdown efb92fda84 added new LING_PROTECT flag and gave it to plasmamen, allowed Slime People to be clings and removed NO_SCAN and NO_BLOOD absorb/sting restriction 2016-09-23 13:53:49 +04:00
Aurorablade 2b19b81b99 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into DWI 2016-09-17 01:38:02 -04:00
Fox-McCloud cffd88ee8a Merge remote-tracking branch 'upstream/master' into cloning-update 2016-09-05 18:31:18 -04:00
KasparoVy 1373070b98 More Conflict Resolution 2016-09-03 21:29:10 -04:00
TheDZD f351e40f0c Makes shields counter xeno leap more effectively 2016-09-01 11:34:00 -04:00
Fox-McCloud bc7f3c67a6 Cloning Update 2016-08-31 01:48:02 -04:00
Aurorablade 65d1c781c8 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into DWI 2016-08-26 21:54:56 -04:00
Fox McCloudandGitHub 4f590f27c4 Merge pull request #5537 from Crazylemon64/debug_log_to_error_viewing 
Moves from `log_debug` to `log_runtime` for non-fatal abberant states
 2016-08-26 21:15:31 -04:00
KasparoVy cd9b12086b Merge remote-tracking branch 'upstream/master' into repathing-sprite-accessories 2016-08-26 02:28:47 -04:00
Crazylemon64 16dd4e9d21 Moves many uses of log_to_dd to log_runtime, to make the output 
more visible at runtime, to someone who isn't watching DD first-hand
 2016-08-24 09:55:19 -07:00
Crazylemon64 03b7d1b3a9 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into space_transition_runtime_fix 2016-08-23 13:41:39 -07:00
TheDZDandGitHub 01e3aef4a3 Merge pull request #5524 from Crazylemon64/recycler_contents_fix 
Fixes a runtime when a recycler eats something containing other stuff
 2016-08-23 14:07:57 -04:00
Crazylemon64 5b20506b02 Replaces qdeleted with a cleaner macro 2016-08-22 23:49:33 -07:00
Crazylemon64 bf2a895658 Makes space transition checks more consistent 
Fixes a runtime on map start due to not having updated all the border
definitions all at once - the new defines will now resolve this.
 2016-08-22 19:46:23 -07:00
Kyep 5d0c5d3dfd Update 8 - The Great Delete Of Useful Stuff 2016-08-21 23:35:13 -07:00
Fox-McCloud 8cd6e58c07 updates 2016-08-21 11:44:54 -04:00
KasparoVy 9bc614a28e Conflict resolution and adds sanitization to marking SQL handling. 2016-08-21 00:01:12 -04:00
Fox McCloudandGitHub 7d9770f59d Merge pull request #5486 from TheDZD/genetics2 
Genetic Instability Refactor & Minor Genetics Rebalance
 2016-08-19 20:11:46 -04:00
TheDZDandGitHub 610c10977f Merge pull request #5482 from Fox-McCloud/kinetic-smasher 
Kinetic Crusher
 2016-08-19 20:11:28 -04:00
KasparoVy ab3f71b359 Conflict resolution again 2016-08-19 01:08:08 -04:00
TheDZD fda0953f03 Minor genetic instability refactor & minor genetics rebalance 2016-08-18 15:01:19 -04:00
KasparoVy 29a90bff9f Conflict resolution. 2016-08-18 03:28:03 -04:00
Fox-McCloud 5c783f2110 fixup 2016-08-18 00:09:57 -04:00
Krausus 541076b6b4 Conflict resolution 2016-08-17 22:54:22 -04:00
Fox-McCloud 1f364c1bcf Kinetic Smasher 2016-08-17 20:31:37 -04:00
Fox-McCloud 71d862cabd Merge remote-tracking branch 'upstream/master' into strips-out-media 2016-08-17 17:46:26 -04:00
KasparoVy e0bfbd0af6 Keeping up to date. 2016-08-17 02:56:34 -04:00
Krausus 4478855cfd Process deferral and profiling improvements 2016-08-17 02:10:39 -04:00
Fox-McCloud ba136b8cfd further removal 2016-08-14 18:25:14 -04:00
KasparoVy 4bd468b85e Defines and Morph Eye-colour Change Fix. 2016-08-14 06:21:26 -04:00
Fox-McCloud 1df5fd5e9d Strips Out Media Players 2016-08-14 00:03:09 -04:00
Aurorablade baa8668dc6 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into DWI 2016-08-12 23:53:32 -04:00
Fox-McCloud 3dcc4bdecd Removes Mutiny 2016-08-12 22:44:11 -04:00
KasparoVy a5722fdfc4 Overhaul, adds color2R/G/B helper procs, adds marking/head accessory/body accessory (colours included) randomization in char prefs. 
Color2R/G/B helper procs and PR overhaul suggested/co-authored by Krausus.
 2016-08-12 22:37:40 -04:00
Fox-McCloud 41a74fb865 Malf AI Rework 2016-08-11 05:16:06 -04:00
Aurorablade 39924a55fd Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into DWI 2016-08-11 02:01:41 -04:00
Tigercat2000 58103757cc Merge remote-tracking branch 'upstream/master' into GAMEMODE_CODE_AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA 
Conflicts:
	code/game/gamemodes/newobjective.dm
	code/game/gamemodes/objective.dm
 2016-08-10 14:16:42 -07:00
KasparoVy 3610cfd4ea Markings refactor, body/marking/head accessory/hair sprite darkening, adds tail markings, more hair styles... 
Tajara ears are on their head now, fixes a crash bug with tail wagging
with body accessories that are split-rendered, adds secondary
hair/facial hair themes, fixes issues with human/skrell arm/lower body
sprites etc.
 2016-08-09 22:01:45 -04:00
Aurorablade 5e90dd83ed Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into DWI 2016-08-09 02:43:27 -04:00