cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-01-20 06:22:41 +00:00
Code Issues Packages Projects Releases Wiki Activity
44,949 Commits 28 Branches 2 Tags
d02165e0f94de2c4a9399a8699cc355da4f8a329
Commit Graph

205 Commits

Author SHA1 Message Date
Mark van Alphen
cd362d6bad Wormhole jaunter fix (and replace lighting checks with simulated) and disk compartmentalizer fix 2019-06-03 21:44:01 +02:00
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
variableundefined
17bbe5659c Merge pull request #11520 from Citinited/spooky-apcs 
Boo affects APCs (again) & no more infinite Boo
 2019-05-23 23:49:47 +08:00
Citinited
cd3b25bd24 Boo affects APCs again 
Also reworks the boo code
 2019-05-11 18:15:13 +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
adf53ecbed Fix lights not turning off on delete 2019-04-27 16:48:32 +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
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
Mark van Alphen
44347029db Compile fix 2019-04-23 23:22:03 +02:00
Mark van Alphen
0d883a5b88 Darkness handling update 2019-04-23 22:59:00 +02:00
Mark van Alphen
211468b24f Add fake ambient occlusion 2019-04-21 01:45:30 +02:00
joep van der velden
3fba7c7aa7 add_reagent 2019-04-14 18:02:13 +02:00
joep van der velden
d102e7f80d dm is smurt(ish) 2019-04-14 09:57:48 +02:00
joep van der velden
c077d80514 no puke in space alone 2019-04-13 10:58:25 +02:00
joep van der velden
9166de2a3d puke update 2019-04-13 10:56:30 +02:00
joep van der velden
244bdf131e also in space... 2019-04-12 23:00:25 +02:00
joep van der velden
824f26d0f4 let me hear that puking though 2019-04-12 22:59:49 +02:00
joep van der velden
55282f15d6 less puke related lag 2019-04-12 22:58:11 +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
fb337f2825 Port over Lavaland mobs and turfs (not finished) 2019-03-29 23:45:36 +01:00
Fox McCloud
d0ea5ee8b9 Crit Rework Final Submission 2019-03-28 17:28:00 -04:00
Fox McCloud
277722508a [Goonchem] Reagent Temperature 2019-03-18 20:06:15 -04:00
variableundefined
d7b2648020 Merge pull request #10185 from Mitchs98/moveresist 
Ports Move Force from TG
 2018-12-28 20:53:07 +08:00
variableundefined
328a2d3dcb Merge pull request #10283 from Ty-Omaha/reflector-blob 
Adds/ports modified reflective blobs
 2018-11-24 08:28:37 +08:00
Ty-Omaha
cb8bc0f34d reflector blobs 2018-11-23 11:19:55 -05:00
Ty-Omaha
2ce52aa2fe ricochet and stuff 2018-11-21 10:50:45 -05:00
Mitchell
7cd25c4d87 for ansari to view 2018-11-11 15:59:48 -06:00
variableundefined
b5425869da Most content fixed, except for blob act. 2018-11-05 21:33:42 +08:00
variableundefined
7544ae573f Add in squeak component and refactor mouse, bikehorn, clown suit to use it. 2018-11-04 14:17:45 +08:00
tigercat2000
13a095ec4a Fix atom init again 2018-10-23 18:48:56 -07:00
tigercat2000
88a051e5dc Roll the damn changes back, init works now 2018-10-23 17:48:22 -07:00
tigercat2000
8ef1b97f45 Merge remote-tracking branch 'upstream/master' into multivis 
# Conflicts:
#	.travis.yml
#	_maps/map_files/MetaStation/z2.dmm
#	_maps/map_files/cyberiad/z2.dmm
#	code/game/atoms_movable.dm
#	code/game/machinery/camera/camera.dm
#	code/modules/mob/living/silicon/ai/ai.dm
#	code/modules/mob/living/silicon/ai/freelook/eye.dm
 2018-10-23 17:41:41 -07:00
variableundefined
e42adaa276 Fix 2018-10-21 21:59:43 +08:00
variableundefined
0dc7b39740 Remove 511 compatibility things 2018-10-21 21:54:50 +08:00
variableundefined
e2f7b7e388 Deconflict once again 2018-10-21 10:18:15 +08:00
variableundefined
d4376fff69 Fixes conflict and screen object breaking 2018-10-21 08:31:46 +08:00
variableundefined
747684927a Formatting fixes & spanning fish tank 2018-10-13 22:12:37 +08:00
variableundefined
65c246c1c9 TG container_type refactor 2018-10-13 08:20:52 +08:00
variableundefined
309e3b04f6 Clears up some relative pathing part 1 2018-10-10 23:39:34 +08:00
variableundefined
021f55539f Merge pull request #9776 from tigercat2000/hover_indicator_inventory 
SSOverlays & Hover Inventory Indicator
 2018-10-10 22:19:26 +08:00
tigercat2000
8ce0592ac0 SSOverlays & Hover Inventory Indicator 
This ports the hover inventory indicator from /tg/, and by necessity, SSOverlays.
The hover inventory indicator basically shows where you are trying to
put an item, and then shows an item ghost in red or green, giving visual
feedback as to if that item will go in the slot or not.

SSOverlays is a much broader system for managing overlays, which should
eventually take over *all* overlays, but I have only ported the basic
system and implemented it where necessary for it to work for the hover
inventory items currently.
 2018-10-08 22:50:39 -07:00
variableundefined
024c894f31 Improve poolcontroller performance 2018-10-09 09:31:59 +08:00
Crazy Lemon
ca26739109 Merge pull request #9477 from variableundefined/SSPortShuttle 
Port Shuttle to StonedMC
 2018-10-01 01:13:42 -07:00
variableundefined
a499b0fc68 Paving the path for a bigger inventory refactor 2018-09-23 22:26:10 +08:00
variableundefined
c86bb17739 511 compatibility horror. 2018-09-09 17:27:09 +08:00
variableundefined
17a5454fbc Port over three PRs from TG about component. 2018-09-04 23:19:30 +08:00
variableundefined
bc22544919 Port Shuttle to StonedMC 2018-09-02 22:22:33 +08:00
Kyep
1e894f11ee CrazyLemon RPD changes 2018-08-15 22:36:53 -07:00
Crazy Lemon
384fe93d33 Merge pull request #8975 from Citinited/rpd-refactor 
RPD refactor
 2018-07-16 14:22:38 -07:00
tigercat2000
141d8487ca Fix atom Initializations not inheriting /New arguments 2018-06-05 22:35:23 -07:00