cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-01-08 08:31:53 +00:00
Code Issues Packages Projects Releases Wiki Activity
45,018 Commits 26 Branches 2 Tags
cf31a774a562f4e4df70d6910d4dc14e4c3cc590
Commit Graph

1775 Commits

Author SHA1 Message Date
Couls
cf31a774a5 Rechargers can be built now 
Rechargers now use capacitors as their stock parts and recharge faster depending on the quality of the recharger(may need balancing)
Can now also place smaller machinery on tables by clicking on the table while pulling them(microwaves and soda dispensers are some examples)
 2019-07-01 01:19:17 -04:00
Mark van Alphen
94eb652f15 Fix alarms triggering on non-contact levels, spectral blade ghost fix, assigning outfits runtime fix 2019-06-03 17:39:23 +02:00
Mark van Alphen
fd8a9e4909 Water handling improvement 2019-06-03 00:06:29 +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
531201fab4 Merge branch 'master' into hooks-part4 2019-05-08 22:21:12 +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
Fox McCloud
79815eb042 Merge pull request #11357 from Markolie/lighting 
Lighting system update
 2019-05-08 00:27:16 -04:00
AffectedArc07
014d803eba Merge branch 'master' into hooks-part4 2019-05-07 21:22:59 +01:00
AffectedArc07
51998efe56 Fixes #2 2019-05-07 18:01:11 +01:00
AffectedArc07
19d8efef68 Morgue Updating [Hooks P4] 2019-05-06 10:08:28 +01:00
AffectedArc07
130b5ef694 Fox fixes. Foxes? 2019-05-06 08:51:44 +01:00
Mark van Alphen
7fb7cdc57f Chair plane fix (and maybe fixes the disappearing humans, too) 2019-05-06 03:52:01 +02:00
AffectedArc07
f2bcd204bc Fixes captains displaycase [Hooks P3] 2019-05-05 22:31:24 +01: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
Unknown
0d81c2da7c Adds Pig Crate 2019-05-01 14:19:43 -05: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
variableundefined
75a9ca9a10 Merge pull request #11397 from Arkatos1/cabinet 
Fire extinguisher cabinet QoL update
 2019-04-30 13:05:12 +08:00
Fox McCloud
7b57d2e319 fixups 2019-04-29 04:41:31 -04:00
Arkatos1
718d05f0fb Code review fixes 2019-04-28 20:27:45 +02:00
Arkatos1
3181843ce4 Code review fixes, no drop sanity check 2019-04-28 12:31:07 +02:00
Arkatos1
ce5cd16b7e Fire cabinet QoL update 2019-04-28 00:57:12 +02: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
Fox McCloud
0034e851a1 Kills off Object and Fast Object Processes 2019-04-23 23:53:40 -04:00
Mark van Alphen
c4dc5ecd3d Merge branch 'ambientocclusion' of https://github.com/Markolie/Paradise into lighting 2019-04-22 18:52:55 +02:00
Mark van Alphen
7fef96e38d Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs 
# Conflicts:
#	paradise.dme
 2019-04-21 23:27:23 +02:00
Fox McCloud
d88411f947 Merge pull request #11255 from Markolie/safe 
Safe refactor
 2019-04-21 04:04:13 -04:00
Mark van Alphen
211468b24f Add fake ambient occlusion 2019-04-21 01:45:30 +02: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
09da967bd1 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs 
# Conflicts:
#	_maps/map_files/RandomZLevels/moonoutpost19.dmm
#	_maps/map_files/cyberiad/cyberiad.dmm
 2019-04-18 03:15:52 +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
joep van der velden
11abbd1ef2 Fixes windoors not spawning electronics once deconstructed 2019-04-17 12:09:20 +02:00
variableundefined
eb83a2dee7 Merge pull request #11285 from Fox-McCloud/elecrocution-refactor 
Refactors Electrocution
 2019-04-16 19:47:42 +08:00
Fox McCloud
58a7107eae shocking animals 2019-04-12 16:03:18 -04:00
Mark van Alphen
bfbebca770 Make sure images are qdel'd 2019-04-11 19:44:10 +02:00
Fox McCloud
93118f9d34 Remaps Toxins 2019-04-11 07:24:16 -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
Mark van Alphen
8c5847f9ea Code review fixes 2019-04-11 07:22:43 +02: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
Ionward
ba7491fa49 cleaned up and made all mantles a child of the base mantle 2019-04-09 02:54:06 -07:00
Ionward
a792d46085 adds mantles! 3 public access ones (in default clothes vendor,) and 6 command ones, each in their respective heads' lockers. 2019-04-09 01:06:19 -07:00
Mark van Alphen
dde5f1c04c Code review fixes 2019-04-07 18:48:34 +02:00
Mark van Alphen
a045382fb3 Fixes 2019-04-07 00:42:44 +02:00
Mark van Alphen
6425d6cc40 Refactor tumbling mechanism 2019-04-07 00:34:02 +02:00
Mark van Alphen
be92148517 Safe refactor 2019-04-06 23:20:26 +02:00
Fox McCloud
638c225397 Merge pull request #11140 from dovydas12345/Statues 
Removes a unneeded dot from diamond statue names
 2019-04-06 03:14:58 -04:00