variableundefined
ed157b56e3
Merge pull request #11868 from SteelSlayer/smes-fix
...
Fixes bugs/exploits related to SMES. Reorganizes parts of the SMES file
2019-08-26 08:43:02 -04:00
Fox McCloud
3140255fc8
Reverts "Fixes Grid Check"
2019-08-26 00:44:46 -04:00
SteelSlayer
a2dc9aa6f8
removes implicit src
2019-08-25 09:04:27 -04:00
variableundefined
28980c0b79
Merge pull request #11862 from Ty-Omaha/grid-check-fix
...
Fixes Grid Check
2019-08-25 06:37:22 -04:00
Mark van Alphen
14e8022daf
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into portalfix
...
# Conflicts:
# code/game/objects/effects/step_triggers.dm
2019-08-09 23:38:49 +02:00
SteelSlayer
37fccc2f76
Update smes.dm
...
Reorganized things a lot of things, didn't add too much. Functionality remains the same.
Fixed a bug where you could get infinite wire from spam dismantling SMES terminals
Fixed the bug of not using up wire when building a SMES terminal
Added a wire sound when placing a SMES terminal
2019-07-16 11:05:21 -04:00
Mark van Alphen
fd579015b1
Portal fixes - adds oldloc to Crossed()
2019-07-15 20:16:17 +02:00
Ty-Omaha
12f1bb1de8
power
2019-07-15 08:43:05 -04:00
Couls
cee64d5c37
Merge remote-tracking branch 'upstream/master' into diagonal-movement
2019-07-08 10:13:15 -04:00
variableundefined
742bc62c8b
Merge pull request #11544 from Arkatos1/recharger
...
Rechargers now show their contents and charge status on examine
2019-07-08 20:18:36 +08:00
Couls
e3a19841d9
Merge remote-tracking branch 'upstream/master' into diagonal-movement
2019-06-22 03:54:43 -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
Couls
5979166f54
Merge remote-tracking branch 'upstream/master' into diagonal-movement
2019-06-02 21:59:58 -04:00
Mark van Alphen
58427ab097
Make sure engine floors don't expose space, remove separate Lavaland vendor and add more voucher kits
2019-05-31 05:45:37 +02: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
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
Couls
fe68c74466
Merge branch 'master' into diagonal-movement
2019-05-22 14:24:54 -04:00
Arkatos1
fdd2ca94d4
added get_cell() proc to remaining items using cells
2019-05-18 23:52:18 +02:00
Arkatos1
e000e29b09
rechargers now show their contents and charge status on examine
2019-05-18 19:56:30 +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
Citinited
86d5b4b070
Handles APC spoopiness differently
2019-05-11 23:32:32 +01:00
Citinited
cd3b25bd24
Boo affects APCs again
...
Also reworks the boo code
2019-05-11 18:15:13 +01:00
AffectedArc07
510c210930
Merge
2019-05-09 17:06:35 +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
Couls
fb619648a9
Resolve conflicts
2019-05-03 22:28:04 -04:00
Mark van Alphen
9009cd443e
Fix pipe layering
2019-05-04 00:47:16 +02: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
AffectedArc07
ec790efeaa
SSticker
2019-04-30 16:47:47 +01:00
Fox McCloud
3dd2c80882
for now
2019-04-29 05:44:17 -04:00
Fox McCloud
7b57d2e319
fixups
2019-04-29 04:41:31 -04:00
Fox McCloud
d0a077f9d5
Powernet Refactor
2019-04-27 02:06:04 -04: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
Couls
a8db26df98
Merge remote-tracking branch 'upstream/master' into diagonal-movement
2019-04-25 23:45:08 -04:00
Fox McCloud
0034e851a1
Kills off Object and Fast Object Processes
2019-04-23 23:53:40 -04:00
Mark van Alphen
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
AffectedArc07
fa6ba7343f
Merge branch 'master' into ss-alarms
2019-04-23 20:37:42 +01:00
variableundefined
73f4c6ea99
Merge pull request #11284 from Arkatos1/Null_Charge
...
New Shadowling Ability - Null Charge! (replaces Drain Life)
2019-04-23 21:02:11 +08:00
AffectedArc07
acee1dcb42
SSalarms
2019-04-23 12:45:35 +01:00
Couls
a188a6b890
change some move procs
2019-04-23 05:56:12 -04:00
Fox McCloud
4761ded0d4
Merge pull request #11350 from AffectedArc07/ss-everything
...
Gives the orphans a home
2019-04-21 18:44:38 -04:00
AffectedArc07
ff78ff1a9c
SScommunications
2019-04-21 20:12:14 +01: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
Fox McCloud
58a7107eae
shocking animals
2019-04-12 16:03:18 -04:00
Fox McCloud
90c9f3f479
Refacors Electrocution
2019-04-10 18:09:14 -04:00
Arkatos1
6a198b9c7f
Adds Null Charge ability for the Shadowlings, replacing Drain Life
2019-04-10 23:37:05 +02:00
Mark van Alphen
877cfc4d7d
Refactor catwalks to not be floors, update chasms and fix Lavaboat
2019-04-04 22:01:25 +02:00
Mark van Alphen
1619bc048b
Lavaland baseturf implementation
2019-03-31 22:07:30 +02:00
Mark van Alphen
1689e46f1e
Added Syndicate base and ported over turf decals
2019-03-31 20:26:02 +02:00
Fox McCloud
814e492a55
Suicide Refactor
2019-03-27 22:54:26 -04:00
Fox McCloud
277722508a
[Goonchem] Reagent Temperature
2019-03-18 20:06:15 -04:00
