cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-01-07 08:02:49 +00:00
Code Issues Packages Projects Releases Wiki Activity
44,828 Commits 26 Branches 2 Tags
b65fbb907ea35c693a2ef48aef656a7d043a2e77
Commit Graph

2036 Commits

Author SHA1 Message Date
Mark van Alphen
ef479cb982 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs 
# Conflicts:
#	icons/mob/feet.dmi
#	paradise.dme
 2019-05-23 19:04:09 +02:00
Fox McCloud
cbe4fe9b2e Merge pull request #11533 from Markolie/lighting 
Rotatium fix
 2019-05-18 15:44:07 -04:00
Mark van Alphen
4ccf04124c Rotatium fix 2019-05-16 18:50:18 +02: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
AffectedArc07
f35c87dc19 Merge branch 'master' into ss-ticker 2019-05-13 18:14:00 +01:00
variableundefined
10c1d71d53 Merge pull request #11483 from datlo/golem-traitor-fix 
Fix golem getting selected as auto traitors
 2019-05-12 07:39:27 +08:00
datlo
edee2cfcea Replace by job check 2019-05-10 13:36:35 +01:00
AffectedArc07
510c210930 Merge 2019-05-09 17:06:35 +01:00
Mark van Alphen
2618def9a1 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs 
# Conflicts:
#	_maps/map_files/Delta/delta.dmm
#	_maps/map_files/MetaStation/MetaStation.v41A.II.dmm
#	_maps/map_files/MetaStation/z4.dmm
#	_maps/map_files/RandomRuins/SpaceRuins/derelict5.dmm
#	_maps/map_files/RandomRuins/SpaceRuins/spacebar.dmm
#	_maps/map_files/RandomZLevels/spacebattle.dmm
#	_maps/map_files/cyberiad/cyberiad.dmm
#	_maps/map_files/cyberiad/z4.dmm
#	_maps/map_files/cyberiad/z6.dmm
#	_maps/map_files/generic/z5.dmm
#	code/__DEFINES/misc.dm
#	code/__HELPERS/unsorted.dm
#	code/game/objects/structures/lattice.dm
#	code/game/turfs/space/space.dm
#	code/modules/mob/mob.dm
#	code/modules/ruins/ruin_areas.dm
#	paradise.dme
 2019-05-08 21:40:35 +02:00
Mark van Alphen
bbeb07abd2 More lighting fixes 2019-05-04 03:06:10 +02:00
Mark van Alphen
35b1cee88b Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs 
# Conflicts:
#	icons/obj/toy.dmi
 2019-05-03 18:31:45 +02:00
Mark van Alphen
d646ab0934 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into lighting 
# Conflicts:
#	code/game/area/Space Station 13 areas.dm
 2019-05-03 18:30:07 +02:00
Kyep
2cf6f1aa79 fixes add_reagent runtimes for blobs 2019-05-02 19:54:11 -07:00
Mark van Alphen
ba0f6abb02 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs 
# Conflicts:
#	code/game/objects/items.dm
#	code/modules/power/cable.dm
#	icons/mob/inhands/items_lefthand.dmi
#	icons/mob/inhands/items_righthand.dmi
#	icons/obj/lighting.dmi
#	paradise.dme
 2019-04-30 19:26:17 +02:00
Mark van Alphen
ad2238f496 Merge branch 'master' into lighting 2019-04-30 19:15:58 +02:00
AffectedArc07
ec790efeaa SSticker 2019-04-30 16:47:47 +01:00
variableundefined
9512a3b76a Merge pull request #11375 from Arkatos1/BeakerQoL 
Puts beakers in your hand upon eject from chemistry machines
 2019-04-29 23:07:09 +08:00
Mark van Alphen
4423962a2a Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs 
# Conflicts:
#	code/controllers/subsystem/mapping.dm
#	paradise.dme
 2019-04-26 23:07:57 +02:00
Mark van Alphen
e4dd9110ee Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into lighting 
# Conflicts:
#	paradise.dme
 2019-04-26 22:58:56 +02:00
variableundefined
4b9bac327e Merge pull request #11364 from Fox-McCloud/death-of-object-processing 
Kills off Object and Fast Object Processes
 2019-04-26 08:11:48 +08:00
Arkatos1
4424eb732f Puts beakers in your hand on eject from chemistry machines 2019-04-25 11:41:27 +02:00
Fox McCloud
ce0b2c5828 Merge pull request #11367 from farie82/juice-fix 
fixed orange juice and doctordelight not working on ingestion
 2019-04-24 13:54:56 -04:00
joep van der velden
b19d460909 fixed orange juice and doctordelight 2019-04-24 13:03:22 +02:00
Fox McCloud
0034e851a1 Kills off Object and Fast Object Processes 2019-04-23 23:53:40 -04:00
Mark van Alphen
ccef4d1187 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs 
# Conflicts:
#	icons/mob/actions/actions.dmi
#	paradise.dme
 2019-04-24 02:55:32 +02:00
variableundefined
03a5ee47b8 Merge pull request #11292 from farie82/puke-refactor 
Refactors puke to make it less lag inducing
 2019-04-23 19:45:01 +08:00
variableundefined
b738f9a92f Merge pull request #11283 from Fox-McCloud/emote-refactor 
Emote Refactor
 2019-04-23 19:44:26 +08:00
Mark van Alphen
7687bf85ca Proper meth 2019-04-22 23:43:47 +02:00
Mark van Alphen
c58b7de171 fentanyl --> meth 2019-04-22 23:43:05 +02:00
Mark van Alphen
3285efd36c Final lighting updates 2019-04-22 22:43:21 +02:00
Mark van Alphen
ab7fb176f6 Opacity fix, re-add rotatium 2019-04-22 22:04:31 +02:00
Mark van Alphen
d66d0e3203 Area invisibility fix 2019-04-22 21:06:33 +02:00
Mark van Alphen
64f8300c2d Switch to preference toggle for ambient occlusion 2019-04-21 18:11:10 +02:00
Mark van Alphen
211468b24f Add fake ambient occlusion 2019-04-21 01:45:30 +02:00
Mark van Alphen
6faf9c769f Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs 
# Conflicts:
#	code/modules/mob/living/simple_animal/friendly/farm_animals.dm
#	paradise.dme
 2019-04-17 22:46:43 +02:00
variableundefined
eb83a2dee7 Merge pull request #11285 from Fox-McCloud/elecrocution-refactor 
Refactors Electrocution
 2019-04-16 19:47:42 +08:00
joep van der velden
9166de2a3d puke update 2019-04-13 10:56:30 +02:00
Fox McCloud
964bf03697 icy floors 2019-04-13 04:44:25 -04:00
joep van der velden
55282f15d6 less puke related lag 2019-04-12 22:58:11 +02:00
Fox McCloud
58a7107eae shocking animals 2019-04-12 16:03:18 -04:00
Mark van Alphen
c597c9be51 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs 
# Conflicts:
#	code/game/turfs/simulated/floor/plating.dm
#	code/modules/clothing/suits/jobs.dm
#	icons/mob/suit.dmi
#	icons/obj/clothing/suits.dmi
 2019-04-11 07:27:51 +02:00
Crazy Lemon
6c4eb66da8 Merge pull request #11282 from Fox-McCloud/atmos-defines 
Atmos Define Cleanup + Plasma Tweaks
 2019-04-10 22:18:52 -07:00
Fox McCloud
90c9f3f479 Refacors Electrocution 2019-04-10 18:09:14 -04:00
Mark van Alphen
f94796c125 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs 
# Conflicts:
#	code/game/objects/items.dm
#	icons/turf/floors/plating.dmi
#	paradise.dme
 2019-04-10 21:54:54 +02:00
Fox McCloud
c536c55b28 Emote Refactor 2019-04-10 15:42:12 -04:00
variableundefined
c6b8daa9b1 Merge pull request #11227 from Fox-McCloud/sr-update 
Minor Strange Reagent Tweaks
 2019-04-10 10:47:40 +08:00
variableundefined
aee2f6772e Merge pull request #11217 from Fox-McCloud/reagent-bodytemp 
Tweaks Reagent Bodytemp Interaction
 2019-04-10 10:42:31 +08:00
Fox McCloud
42a6f4ef30 tweak 2019-04-09 11:32:21 -04:00
variableundefined
ff8dc59367 Merge pull request #11229 from Fox-McCloud/reagent-tweaks 
[Goonchem] Reagent tweaks
 2019-04-07 21:22:18 +08:00
Fox McCloud
8e0f0906a3 Merge remote-tracking branch 'upstream/master' into sr-update 2019-04-06 19:58:12 -04:00