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
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
330708a578
Fix mining bot mesons
2019-05-15 23:08:24 +02:00
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
510c210930
Merge
2019-05-09 17:06:35 +01:00
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
d98eb14a39
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs
...
# Conflicts:
# code/__DEFINES/misc.dm
# code/modules/mob/living/simple_animal/hostile/hostile.dm
# code/modules/mob/living/simple_animal/hostile/mining_mobs.dm
# code/modules/shuttle/shuttle.dm
# icons/mob/actions/actions.dmi
# paradise.dme
2019-05-04 03:16:38 +02:00
bbeb07abd2
More lighting fixes
2019-05-04 03:06:10 +02:00
4c99f3913b
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into lighting
...
# Conflicts:
# paradise.dme
2019-05-03 20:31:41 +02:00
6e79364b65
Here we go again
2019-05-03 21:47:07 +08:00
ec790efeaa
SSticker
2019-04-30 16:47:47 +01:00
40c1a25eb5
Lighting fixes
2019-04-27 01:08:17 +02:00
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
e4dd9110ee
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into lighting
...
# Conflicts:
# paradise.dme
2019-04-26 22:58:56 +02:00
0034e851a1
Kills off Object and Fast Object Processes
2019-04-23 23:53:40 -04:00
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
20b9285fc4
Wisp/meson implant fixes
2019-04-24 01:36:56 +02:00
9e9d72d2ae
Darkness fixes
2019-04-24 00:47:55 +02:00
0d883a5b88
Darkness handling update
2019-04-23 22:59:00 +02:00
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
7fef96e38d
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs
...
# Conflicts:
# paradise.dme
2019-04-21 23:27:23 +02:00
52dff88bd9
Die monster! You don't belong in this world!
2019-04-17 16:30:43 +01:00
55282f15d6
less puke related lag
2019-04-12 22:58:11 +02:00
877cfc4d7d
Refactor catwalks to not be floors, update chasms and fix Lavaboat
2019-04-04 22:01:25 +02:00
19b923c999
Ash Walker/Gutlunch fixes. Glass containers now do not splash on help intent, for milking.
2019-04-03 17:24:55 +02:00
9f5b3fc796
updates
2019-04-02 20:26:23 +01:00
3f6f4555d7
Minor Lavaland item fixes
2019-04-01 23:51:41 +02:00
f75de97c6e
Port over Corn and affected's work on Lavaland
...
Co-authored-by: AffectedArc07 <josephcase55@hotmail.com >
Co-authored-by: CornMyCob <xxxxbarryscottxxxx@gmail.com >
2019-04-01 23:41:32 +02:00
ed153d3566
Add seed vault and animal hospital
2019-03-31 23:49:18 +02:00
bf68f966b1
Add Ash Walkers, work on Syndicate base
2019-03-31 04:33:39 +02:00
a05b37c5ca
General Lavaland fixes, add Hierophant ruin
2019-03-31 01:12:10 +01:00
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
f92be2c67d
Add Beach biodome ruin and other fixes
2019-03-30 22:48:11 +01:00
c370e08233
Port the actual Lavaland map (and associated fixes)
2019-03-30 04:12:37 +01:00
f0dab66ebc
Further turf updates, add Necropolis/boss turfs
2019-03-30 01:24:03 +01:00
2091a431bb
Split mining mob files
2019-03-29 23:55:54 +01:00
fb337f2825
Port over Lavaland mobs and turfs (not finished)
2019-03-29 23:45:36 +01:00
277722508a
[Goonchem] Reagent Temperature
2019-03-18 20:06:15 -04:00
38c64a953e
Golem tweaks
...
Shuttle interior walls and floors are now fully simulated and can be
deconstructed/built upon. Exterior is still shuttle walls
Increased the cost of RND boards to 2000
Golems can no longer activate robotic brains or have their brain put in
an MMI
Replaced one welding fuel tank by a chem master 3000
2019-02-12 02:07:01 +00:00
4ca61d45de
Update vendor items, update map for botany/xenobio
2019-02-04 02:10:40 +00:00
605bad8417
actually compiles *scream
2019-02-03 19:35:44 +00:00
0ff947ec17
Added golem custom access, boards, and a free KA
...
You must mine for the trigger guard kit before being able to use the KA
2019-02-03 18:27:24 +00:00
912c6b0b9e
asteroid claim improvements, golem ship security
...
Add plating over asteroid tiles if you've claimed them
Asteroid walls can now be used to define rooms (still must be airtight)
Add golem check to the free golem ship
2019-02-03 15:59:04 +00:00
f06e88d82d
Remove base access from golem ID, buff golem KA
2019-02-03 14:35:11 +00:00
74a3631741
compilin and mostly workin
...
has runtimes due to body color
need to wrap up commented procs
2019-02-03 06:40:50 +00:00
f98da3edf8
Progress...
2019-02-02 17:51:25 +00:00
d3448cf287
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into EXTERMINATUSPARTONE
2019-01-29 17:42:39 -05:00
6c53564df2
Merge branch 'master' into GunsAndGunAccessories
...
# Conflicts:
# code/modules/projectiles/guns/projectile/automatic.dm
2019-01-26 02:17:22 -05:00
b812736517
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into EXTERMINATUSPARTONE
2019-01-19 23:35:15 -05:00
4fc35a68b1
Gonna have to clean some files after this.
2019-01-19 22:38:47 -05:00
Mark van Alphen