5c325d33fe
Merge pull request #11684 from IAmBigCoat/medbeamwarnings
...
Added warnings to the medbeam gun re: stream-crossing
2019-07-12 18:17:07 +08:00
36736277a1
Merge pull request #11358 from Couls/diagonal-movement
...
[Ready for Testmerge] Implement Diagonal Movement
2019-07-12 17:12:57 +08:00
2d7f2bb3c2
Code cleanup, spacing fixes
2019-07-09 08:11:43 -04:00
74a7b7ad55
Merge pull request #11566 from Arkatos1/locked
...
Action Buttons - Lockdown
2019-07-09 18:22:40 +08:00
9d9bf046e3
Fix autocomplete input mishandling single quotes
2019-07-08 14:22:52 -07:00
cee64d5c37
Merge remote-tracking branch 'upstream/master' into diagonal-movement
2019-07-08 10:13:15 -04:00
3fdf53b180
Merge pull request #11593 from AzuleUtama/CyberBundleFix
...
Makes Cybernetic Bundles a Nukie-only item again
2019-07-08 20:21:47 +08:00
fb15166fda
Merge pull request #11570 from Tayyyyyyy/autocomplete
...
Autocomplete input
2019-07-08 20:21:22 +08:00
a7b4e0b9ef
Merge remote-tracking branch 'upstream/master' into diagonal-movement
2019-07-07 22:17:19 -04:00
df199a651d
Merge pull request #11663 from Markolie/maskofnarsie
...
Remove traces of the Mask of Nar'Sie
2019-07-07 22:10:02 +08:00
33d35eb625
Merge branch 'master' into diagonal-movement
2019-07-02 05:55:44 -04:00
a189efe72d
Merge pull request #11449 from Shadeykins/AI-Laws
...
Changes Quarantine, NT Default, Aggressive, and Corporate AI Lawsets [REVIEW READY].
2019-06-30 15:15:07 +08:00
497601245f
Merge pull request #11496 from Markolie/cultthings
...
Gives the night vision spell to cult constructs
2019-06-30 14:35:32 +08:00
e3a19841d9
Merge remote-tracking branch 'upstream/master' into diagonal-movement
2019-06-22 03:54:43 -04:00
24c2b0fd4f
j
2019-06-10 19:53:03 +02:00
fea2b2532d
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into cultthings
...
# Conflicts:
# paradise.dme
2019-06-09 23:28:41 +02:00
f04a0a4c53
Added proposed uplink description change.
2019-06-05 17:07:09 -04:00
8645a0b0ef
Added warnings to the medbeam gun re: stream-crossing
2019-06-05 01:49:58 -04:00
94eb652f15
Fix alarms triggering on non-contact levels, spectral blade ghost fix, assigning outfits runtime fix
2019-06-03 17:39:23 +02:00
2dd6dcfb55
Remove traces of the Mask of Nar'Sie
2019-06-03 06:33:43 +02:00
5979166f54
Merge remote-tracking branch 'upstream/master' into diagonal-movement
2019-06-02 21:59:58 -04: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
bddc563343
Makes Cybernetic Bundles Nuke Ops Only Again
2019-05-26 02:24:44 +01: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
7a6321ca5f
Autocomplete input for ghost buttons
2019-05-22 17:18:32 -07:00
fe68c74466
Merge branch 'master' into diagonal-movement
2019-05-22 14:24:54 -04:00
fb8313308e
added action button ability to lock or unlock them in place
2019-05-21 22:44:54 +02: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
variableundefined