cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-30 07:27:57 +01:00
Code Issues Packages Projects Releases Wiki Activity
63,875 Commits 14 Branches 2 Tags
master
Commit Graph
306 Commits
Author SHA1 Message Date
Daveandvariableundefined ed97b0f05b Crayon Fixes (#12327) 2019-09-17 14:43:18 -07:00
Fox McCloud aa49033844 nor-shall-our-souls-falter 2019-09-17 16:06:09 -04:00
Fox McCloud af92373d33 though-this-world-may-be-broken 2019-09-15 05:53:43 -04:00
Fox McCloud 177ac43f23 next-we-melt-the-memories-that-are 2019-09-09 16:20:04 -04:00
Fox McCloud d19961378d first-we-burn-away-the-world-that-was 2019-09-09 14:48:29 -04:00
Coul c6c1b1ce36 fix runtime 2019-09-04 22:20:28 -04:00
Coul 2986205dfa another blood fix 2019-09-04 21:32:28 -04:00
Couls d258c91c7f use qdels instead of initialize hint 2019-08-31 20:34:50 -04:00
Fox McCloud 4502b1fead Fixes Blood, Grafitti, and Fungus not Showing Up 2019-08-28 18:05:51 -04:00
Fox McCloud 727be7d03f WHYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYY?! 2019-08-26 18:23:09 -04:00
Couls dfe9752da7 Merge remote-tracking branch 'upstream/master' into blood-changes 2019-08-25 22:37:25 -04:00
Couls a42f638b73 spessing 2019-08-25 22:22:05 -04:00
Mark van Alphen fd579015b1 Portal fixes - adds oldloc to Crossed() 2019-07-15 20:16:17 +02:00
Couls 18a452b536 use initialize() and fixes 2019-07-07 05:01:42 -04:00
Couls dfc5c4fca3 only call update_icon when entering/exiting from a new direction 2019-07-07 03:30:48 -04:00
Couls fa260b62ff Missed some code 2019-07-07 03:27:50 -04:00
Couls 2470380c40 Blood is now less annoying 2019-07-07 03:21:57 -04:00
Mark van Alphen 2c5e216e82 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs 
# Conflicts:
#	icons/mob/actions/actions.dmi
#	icons/mob/inhands/items_lefthand.dmi
#	icons/mob/inhands/items_righthand.dmi
#	paradise.dme
 2019-05-17 17:37:18 +02:00
Fox McCloudandGitHub 238780cae6 Merge pull request #11511 from Markolie/lighting 
Make the lighting plane master respect client color and other lighting fixes
 2019-05-15 20:42:44 -04:00
Mark van Alphen 0f98a95666 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs 
# Conflicts:
#	icons/mob/actions/actions.dmi
#	paradise.dme
 2019-05-13 22:14:38 +02:00
Mark van Alphen 5b14cf120d Make lighting plane master respect client color 2019-05-10 20:34:11 +02:00
AffectedArc07 ec790efeaa SSticker 2019-04-30 16:47:47 +01:00
Mark van Alphen c878f8e36e Lavaland code review fixes - also integrates flyswatter and cat toy 2019-04-20 00:24:58 +02:00
Mark van Alphen 391d91132c Fix code review issues (planetary_atmos and Initialize()) 2019-04-04 23:23:30 +02:00
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
Fox McCloud 6fadf083d7 OHHHH SHITTTT ANTTTSSS 2019-04-01 01:27:49 -04:00
Mark van Alphen ed153d3566 Add seed vault and animal hospital 2019-03-31 23:49:18 +02:00
Mark van Alphen 1689e46f1e Added Syndicate base and ported over turf decals 2019-03-31 20:26:02 +02:00
Fox McCloud 277722508a [Goonchem] Reagent Temperature 2019-03-18 20:06:15 -04:00
Citinited 5529102530 Adds the snow machine 2018-12-13 08:30:39 +00:00
variableundefinedandGitHub 45fdcb4c46 Merge pull request #9719 from SamHPurp/smoothing-improvements 
Icon Smoothing to StonedMC
 2018-10-21 07:41:47 +08:00
Fox McCloud 3825b4e1d5 Refactors Spark Spread Activation 2018-10-17 14:31:07 -04:00
Purpose a77421f340 Oh dirt merged before the subsystem. Thats why. 2018-10-13 21:37:01 +01:00
Purpose 9ee4347965 conflicts? apparently? 2018-10-10 18:53:22 +01:00
Purpose 4d7dd5a6c9 dayum dats defined 2018-10-08 22:48:00 +01:00
PurposeandGitHub b28527f992 Merge branch 'master' into dirt-smoothing 2018-10-07 17:16:54 +01:00
Purpose eeed299b86 tidyup 2018-10-07 12:43:37 +01:00
Purpose b9d2f0a915 Revert this commit when using subsystem. 2018-10-06 21:54:38 +01:00
Purpose a472eee850 dirt smoothing 2018-10-06 19:22:20 +01:00
Birdtalon 08e6c5e291 fixes poster bug 2018-08-21 22:41:05 +01:00
FalseIncarnate 18a0ff541e Better solution 
Repathed the point decal to the temp_visual effects path. This path has
built-in singularity resistance, and allows me to remove a spawn in
favor of a built-in QDEL_IN call

Also changed points from using the magic number 16 to POINT_LAYER for
their layer definition. This does technically drop the point by 4 layers
(POINT_LAYER is 12), placing them now below the light layer (shouldn't
affect anything) instead of just above it.
 2018-05-30 21:55:26 -04:00
FalseIncarnate 496d4794ad [s] Fixes #9073 
The singulo no longer feeds on attention.
🆑
fix: The singulo no longer feeds on attention.
/🆑
 2018-05-30 21:26:18 -04:00
Fox McCloud cfe182a1f7 Ports over Timer Subsystem 2018-04-28 20:26:04 -04:00
Fox McCloud 5c4aa9b3fd Removes All Weapons 2018-04-15 16:25:56 -04:00
Fox McCloud 22dc6860b3 Ports TG's Garbage Subsystem 2018-03-28 20:02:39 -04:00
KasparoVy a8492ba115 Shortens Helper Proc Name 
Way too long.
Also adds sanity.
 2018-01-10 17:19:10 -05:00
KasparoVy f93c148c54 Fixes #8508 
Checks for blood splatter in the target location properly and avoids creating too many blood atoms.
 2018-01-09 22:07:34 -05:00
tigercat2000andGitHub 591f718995 Merge pull request #7848 from KasparoVy/splat 
Splatter Lands 1 Tile Away in Target Dir & Xeno-blood Splatter Colour Fix
 2017-12-31 08:00:14 -08:00
uraniummeltdown 7ed2c68ea7 compiles, find and replace particle_effect and effect_system 2017-11-04 20:16:01 +04:00
KasparoVy 29ee96be8f Blood Trail Colouration is the Same as Pools 
Blood pools had a duplicate definition of "NO_CLIENT_COLOUR" while it
wasn't defined at all for blood trails.

This resulted in a bug where upon wearing a pair of noir shades or
becoming colourblind, blood trails would take on a different colouration
than blood pools (drips, etc.)

Now resolved by moving the duplicate definition to a place where it can
do some good.
 2017-08-09 23:14:39 -04:00