94eb652f15
Fix alarms triggering on non-contact levels, spectral blade ghost fix, assigning outfits runtime fix
2019-06-03 17:39:23 +02:00
697bb8eee5
More Lavaland fixes:
...
- Air alarm computers will no longer display alarms that can't be remote controlled
- Survival capsules now have a NanoMed
- Fixed the disk compartmentalizer not having a sprite when something is put in
- Fixed the drying rack not having a sprite when something is put in
- Turned water bottles into glass containers so they have more functionality
- Hairless hide can now be made wet using water
- Reagents in glass containers can now be fed to others
2019-06-02 23:29:50 +02:00
f0734672f3
Lavaland fixes:
...
- Survival pod storage being broken when used.
- Wrong wiring on the Syndicate base.
- Added one more oxygen tank to the animal hospital.
- Chasms eating up light atoms.
- Mining satchels not picking up items automatically.
- Releasing the legion/blob mice notifications not having icons.
- Mining gear made orderable at cargo.
2019-05-31 02:21:37 +02:00
b65fbb907e
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs
...
# Conflicts:
# icons/obj/vending.dmi
# paradise.dme
2019-05-30 19:35:52 +02:00
e8d13fec44
Merge pull request #11524 from Fox-McCloud/the-end
...
The End
2019-05-27 19:45:51 +08:00
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
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
ca708563e5
more fixes
2019-05-20 21:02:53 +02:00
72abc2665e
fixes for cling aug vision and general action buttons
2019-05-20 15:42:20 +02:00
d36cb324a0
Spells now charge using the fast processing subsystem
2019-05-19 18:52:01 +01:00
da51a3315c
Fix for infinite boo
2019-05-18 13:02:06 +01:00
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
19c8a8265e
Merge pull request #11486 from Tayyyyyyy/better_ert_spawn
...
Non-blocking ERT selection/spawn
2019-05-17 23:07:30 +08:00
719ffda09e
Merge pull request #11438 from Emanthealmighty/AdminCultist-change
...
Admin created cultists can now properly summon their Gods.
2019-05-17 19:15:39 +08:00
68effd9d83
The End
2019-05-13 17:22:57 -04: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
f35c87dc19
Merge branch 'master' into ss-ticker
2019-05-13 18:14:00 +01:00
c2df74312e
Prevents Future SSTicker from Runtiming
2019-05-13 03:18:34 -04:00
a8af6f53c3
Merge pull request #11501 from Markolie/lighting
...
Fix X-Ray on death for simple mobs
2019-05-09 16:53:49 -04:00
665659bd88
Asynchronously spawn ERT
2019-05-09 11:52:28 -07:00
afc22b03ed
Fix X-Ray on death for simple_mobs, fix view variables damage for non-humans
2019-05-09 19:52:29 +02:00
510c210930
Merge
2019-05-09 17:06:35 +01:00
23c884e14c
Merge pull request #11494 from Markolie/lighting
...
Lighting fixes
2019-05-09 00:09:16 -04:00
458e59a191
Final weather fix
2019-05-09 05:53:53 +02:00
b66ac0559e
Add initial plane to weather
2019-05-09 05:23:14 +02:00
502b8aebc5
Weather lighting fix
2019-05-09 05:09:54 +02:00
3d90ccbfb7
nevermind, just generic fixes
2019-05-08 20:15:24 -04:00
61b337578b
Potentially Solves Disappearing Human Mob Issue?
2019-05-08 17:25:35 -04: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
7fb7cdc57f
Chair plane fix (and maybe fixes the disappearing humans, too)
2019-05-06 03:52:01 +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
f3fb39b339
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into lighting
...
# Conflicts:
# code/__DEFINES/misc.dm
2019-05-04 03:07:36 +02:00
5357e0e36f
Merge pull request #11428 from Markolie/bundles
...
Chameleon overhaul
2019-05-04 08:23:40 +08:00
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
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
bcc1bdc168
Remove jumpsuit from uplink
2019-05-03 18:27:57 +02:00
df4dd5660a
Merge pull request #11422 from Markolie/reviver
...
Make the traitor reviver implant EMP-proof
2019-05-03 22:37:42 +08:00
01127dc5e9
Merge pull request #11429 from Mitchs98/pigcrate
...
Adds Pig Crate to Cargo
2019-05-03 22:19:50 +08:00
5c2608330c
Adds Nanotrasen Hospital ship, admin shuttle templates system.
2019-05-02 20:17:50 -04:00
b27f084eb8
Admin created cultists can now properly summon their Gods
...
Upon being made a cultist through admin means, the "summon spots" will now be generated, even if the game mode isn't cult. This allows admin created cultists to actually reach their goal of summoning their god, if it is what the admins told them to do.
2019-05-02 15:35:40 +02:00
0d81c2da7c
Adds Pig Crate
2019-05-01 14:19:43 -05:00
e9d39b0d27
Chameleon overhaul
2019-05-01 20:59:41 +02:00
0d73736be2
Make the traitor reviver implant EMP-proof
2019-05-01 02:34:16 +02:00
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
ad2238f496
Merge branch 'master' into lighting
2019-04-30 19:15:58 +02:00
ec790efeaa
SSticker
2019-04-30 16:47:47 +01:00
c8d890ef8a
Merge pull request #11365 from Kyep/id_card_tracking
...
Upgrades ID Computer
2019-04-30 13:28:03 +08:00
0fb9167060
Merge pull request #11312 from farie82/cure-text
...
Makes the crit cure texts clearer
2019-04-29 22:58:59 +08:00
36d251574f
Add planetary atmos
2019-04-27 18:52:50 +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
Mark van Alphen