Mark van Alphen
8234881a2a
New custom outfit managers, select equipment refactor and spawn with outfit on transform/reincarnate
2019-06-09 21:46:41 +02:00
Mark van Alphen
ba3f65049d
Port over remaining Lavaland ruins
2019-06-07 01:19:55 +02:00
IAmBigCoat
f04a0a4c53
Added proposed uplink description change.
2019-06-05 17:07:09 -04:00
IAmBigCoat
8645a0b0ef
Added warnings to the medbeam gun re: stream-crossing
2019-06-05 01:49:58 -04:00
Arkatos1
102e27b3c2
Magic with style update
2019-06-04 00:37:42 +02: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
2dd6dcfb55
Remove traces of the Mask of Nar'Sie
2019-06-03 06:33:43 +02:00
Couls
5979166f54
Merge remote-tracking branch 'upstream/master' into diagonal-movement
2019-06-02 21:59:58 -04:00
Mark van Alphen
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
datlo
32812736ee
Integrate free golems as a lavaland ruin
2019-05-31 09:30:03 +01:00
Mark van Alphen
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
Mark van Alphen
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
Mark van Alphen
f45d16f2c3
Observer/hud improvements and fixes
2019-05-27 19:59:54 +02:00
variableundefined and GitHub
e8d13fec44
Merge pull request #11524 from Fox-McCloud/the-end
...
The End
2019-05-27 19:45:51 +08:00
AzuleUtama
bddc563343
Makes Cybernetic Bundles Nuke Ops Only Again
2019-05-26 02:24:44 +01: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 and GitHub
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
tayyyyyyy
7a6321ca5f
Autocomplete input for ghost buttons
2019-05-22 17:18:32 -07:00
Couls and GitHub
fe68c74466
Merge branch 'master' into diagonal-movement
2019-05-22 14:24:54 -04:00
Arkatos1
fb8313308e
added action button ability to lock or unlock them in place
2019-05-21 22:44:54 +02:00
Arkatos1
ca708563e5
more fixes
2019-05-20 21:02:53 +02:00
Arkatos1
72abc2665e
fixes for cling aug vision and general action buttons
2019-05-20 15:42:20 +02:00
Citinited
d36cb324a0
Spells now charge using the fast processing subsystem
2019-05-19 18:52:01 +01:00
Citinited
da51a3315c
Fix for infinite boo
2019-05-18 13:02:06 +01:00
Mark van Alphen
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
variableundefined and GitHub
19c8a8265e
Merge pull request #11486 from Tayyyyyyy/better_ert_spawn
...
Non-blocking ERT selection/spawn
2019-05-17 23:07:30 +08:00
variableundefined and GitHub
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
Couls
8083b51a96
Initial commit
2019-05-16 22:36:30 -04:00
Fox McCloud
68effd9d83
The End
2019-05-13 17:22:57 -04: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
Fox McCloud
c2df74312e
Prevents Future SSTicker from Runtiming
2019-05-13 03:18:34 -04:00
Fox McCloud and GitHub
a8af6f53c3
Merge pull request #11501 from Markolie/lighting
...
Fix X-Ray on death for simple mobs
2019-05-09 16:53:49 -04:00
tayyyyyyy
665659bd88
Asynchronously spawn ERT
2019-05-09 11:52:28 -07:00
Mark van Alphen
afc22b03ed
Fix X-Ray on death for simple_mobs, fix view variables damage for non-humans
2019-05-09 19:52:29 +02:00
AffectedArc07
510c210930
Merge
2019-05-09 17:06:35 +01:00
Fox McCloud and GitHub
23c884e14c
Merge pull request #11494 from Markolie/lighting
...
Lighting fixes
2019-05-09 00:09:16 -04:00
Mark van Alphen
458e59a191
Final weather fix
2019-05-09 05:53:53 +02:00
Mark van Alphen
b66ac0559e
Add initial plane to weather
2019-05-09 05:23:14 +02:00
Mark van Alphen
502b8aebc5
Weather lighting fix
2019-05-09 05:09:54 +02:00
Mark van Alphen
e6b7fd9149
Move night vision spell and give it to constructs
2019-05-09 03:11:06 +02:00
Fox McCloud
3d90ccbfb7
nevermind, just generic fixes
2019-05-08 20:15:24 -04:00
Fox McCloud
61b337578b
Potentially Solves Disappearing Human Mob Issue?
2019-05-08 17:25:35 -04: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
7fb7cdc57f
Chair plane fix (and maybe fixes the disappearing humans, too)
2019-05-06 03:52:01 +02:00
Shadeykins
eeb626887a
Wording in Aggressive
...
Basically the "it" here referred to "harm" and the statement was amibiguous. "It" in this case was however modifying "harm" and not "not harm," which meant that the AI was encouraged to imperil its existence by harming people.
This clarifies the original intent.
2019-05-04 16:04:52 -06:00
Couls
fb619648a9
Resolve conflicts
2019-05-03 22:28:04 -04:00
Mark van Alphen
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
Mark van Alphen
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
variableundefined and GitHub
5357e0e36f
Merge pull request #11428 from Markolie/bundles
...
Chameleon overhaul
2019-05-04 08:23:40 +08:00
Mark van Alphen