8def3bf2af
TS Mother Rework ( #14856 )
...
* basic functionality
* map edit: delete mother from awaymission
* IncubateEggs, PickupSpiderlings, anti-exploit stuff
* editor, please stop messing with my indentation
* fixes
fixes: stops "cancelled" messages when a terror is in an airless pipe, stops incubate being used on eggs on an adjacent tile, makes the "cannot incubate due to lack of regen points" message clearer, stops spiders using remoteview while in a pipe which messes up their vision
* fixes being able to wrap spiderlings/etc into coccoons if they're on top of a dead body
* mother webs block spiderlings from passing them
* AA suggestion
Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com >
Co-authored-by: Kyep <Kyep@users.noreply.github.com >
Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com >
2020-12-02 19:25:19 +00:00
3f75b836b0
Removes /obj/machinery/microwave ( #14718 )
2020-10-24 21:27:33 -04:00
b99f636523
metric ton of pipe fixes
2020-10-07 00:00:37 -07:00
a56b2fb7c5
fixes RD office scrubber in TS gateway
2020-10-06 22:17:49 -07:00
e75c6048b1
mapmerge changes / crunch down
2020-10-06 21:43:23 -07:00
0f10c082a5
removes all tag = "X"
2020-10-06 21:39:19 -07:00
9a416c0986
fixes APCs having req_access=list(201)
2020-10-06 20:20:01 -07:00
d0060c7868
removes rogue pipe in a wall
2020-09-24 06:27:21 -07:00
7d4034f9ba
air supply pipe tweaks
2020-09-24 06:07:32 -07:00
40c107ec03
delete biohazard shutters
2020-09-24 05:07:34 -07:00
e6ba6b9d5d
fix outdated paper in TS away mission
2020-09-24 04:45:33 -07:00
38c9c508e6
Makes Ice Cream GC
2020-07-09 11:03:12 -04:00
69de03a622
Gas Mixture Refactor ( #13602 )
...
* Gas Mixture Refactor
* derp
* defined turf types
* fixes
* cuts turf visuals cost in half
* even better equalizing with planetary atmos
* remove volatile fuel
* comment and documentatino on turf gas vars
2020-06-24 17:48:50 -06:00
9f3da33763
Merge pull request #12853 from SteelSlayer/tank-dispense-hand
...
Makes tanks dispensed from tank storage units get placed into your hands
2020-06-09 21:51:00 -04:00
c76ffe6bde
Maps stuff back in
2020-05-15 21:43:59 +01:00
f93146f6f5
DANNY DELETO - DNPR
2020-05-13 21:41:56 +01:00
3db924a202
fucking map variables, compiler doesn't catch them
2020-04-27 12:20:10 -05:00
affa319fab
Removes Console Screens ( #12512 )
2019-10-08 21:07:50 -04:00
e9d463576f
Reaper cult sprite overhaul ( #12513 )
2019-10-08 20:55:16 -04:00
3ae71f7932
Merge pull request #12245 from Fox-McCloud/universal-damage
...
Universal Object Damage
2019-10-06 23:22:48 -04:00
9e03f75a4b
I-carry-onward
2019-10-06 00:26:03 -04:00
b58d3998e8
Fixes beach visual bugs ( #12487 )
2019-10-03 08:28:57 -04:00
9097dfcacf
Merge remote-tracking branch 'upstream/master' into universal-damage
...
# Conflicts:
# code/game/machinery/machinery.dm
# code/game/objects/items.dm
# code/game/objects/structures.dm
# code/game/objects/structures/inflatable.dm
# code/game/objects/structures/mirror.dm
# code/modules/clothing/spacesuits/hardsuit.dm
# code/modules/clothing/suits/wiz_robe.dm
# code/modules/mob/living/carbon/alien/alien_defense.dm
# code/modules/mob/living/carbon/slime/slime.dm
# code/modules/mob/living/simple_animal/friendly/slime.dm
2019-09-28 00:16:11 -04:00
652920ae3c
Wizard Battlemage Armor ( #12388 )
2019-09-24 15:42:47 -07:00
62226851d9
Merge remote-tracking branch 'upstream/master' into universal-damage
2019-09-23 12:53:52 -04:00
efc79cfc7c
Removes Bodyscanner Console ( #12377 )
2019-09-22 21:11:02 -07:00
184e4877e8
the-gates-of-hell-shall-not-prevail
2019-09-16 02:07:57 -04:00
18b270cb7e
Remove the structure/chair/wood/normal subtype, moving all properties to its parent.
2019-09-11 00:28:27 -04:00
fde5769225
other vending machines
2019-09-08 10:59:04 -04:00
92411d7a02
Merge pull request #11853 from Kyep/ts_gateway_fix
...
Terror Spider Fixes & Tweaks
2019-09-08 03:51:59 -04:00
dca6d98f5f
Refactors Corgis
2019-09-04 18:40:34 -04:00
0102aff057
fixes merge conflict
2019-09-03 19:10:19 -07:00
1a5c25603e
mapping is a pain
2019-08-27 18:32:28 -04:00
1b10495f7d
fix
2019-08-27 18:08:43 -04:00
20ad4888b9
Merge remote-tracking branch 'ParadiseSS13/master' into ts_gateway_fix
2019-08-25 19:56:35 -07:00
cb6df7092c
Hardsuit Helmets Integration
2019-08-24 18:36:27 -04:00
3f50b2b4b3
code quality: TRUE/FALSE
...
squash
2019-08-22 03:41:43 -07:00
2ae1fc7ac2
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into shuttlechairs
...
# Conflicts:
# icons/obj/chairs.dmi
2019-08-09 23:41:07 +02:00
90a2406ada
Moon Outpost 19 mirror fix
2019-06-12 23:35:01 +02:00
f56854292a
Add shuttle chairs (and fix newlines on all maps)
2019-06-07 03:39:24 +02:00
ba3f65049d
Port over remaining Lavaland ruins
2019-06-07 01:19:55 +02:00
eb9ff99542
Another path fix
2019-06-06 01:36:29 +02:00
2171f97ed7
Path fix
2019-06-06 01:35:58 +02:00
fad735142b
Water tile fixes and other minor fancy turf fixes
2019-06-06 00:09:19 +02: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
650383aad1
ChangeTurf fix, incinerator starts off by default, Syndicate base fix
2019-06-03 05:53:56 +02: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
e9a9326db0
Re-add starlight
2019-05-04 04:22:45 +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
5357e0e36f
Merge pull request #11428 from Markolie/bundles
...
Chameleon overhaul
2019-05-04 08:23:40 +08:00
Kyep