Commit Graph

306 Commits

Author SHA1 Message Date
Pidgey
3095a3468e Makes Chicken Man statues in Mr. Chang's into real statues (#13721)
* I think this is ok?

* Chicken Man and Kidan statues are now real statues that can be moved and disassembled (disassembly causes them to vanish without dropping materials as there are no bronze or obsidian stacks). Moved their sprites from decorations to statues for consistency.

* Oops! Metastation too.

* Finally got everything sorted out. Phew!

* The OXENbot on the derelict station is no longer a renamed chicken man statue. It can also be unanchored and sliced up for metal should you be inclined to do so.

* What even is this? Delete this.

* Coding standards

* Removed density variables from the changed statues.

* Fixes conflicts
2020-07-13 14:23:56 -04:00
AffectedArc07
390e41e91d The elephant: Ruin + Whiteship rework (#13632)
* The elephant: Ruin + Whiteship rework

* ROUND TWO: FIGHT

* Forgot this

* Kyet Fixes

* [NEEDS TESTING] Tweaks from new knowledge

* Adds to Meta, Removes from Delta

* This isnt needed anymore

* Adds in one empty space level

* Area tweaks
2020-07-12 13:44:58 -06:00
Fox McCloud
38c9c508e6 Makes Ice Cream GC 2020-07-09 11:03:12 -04:00
Kyep
547d76fb4b Cyborg Improvements (#13056)
* ash storm immunity

* safety override & lavaproof upgrades

* mini-extinguisher for janiborg

* borg cell paths, prevent station borgs using gamma module

* Limit crew SecBorgs to 2, DS borg laser reflection

* replaces standard module with generalist module

* generalist borg gets crowbar

* fix bug where ert engi/med borgs runtime / do not get sprites

* adds TG lavaland and spidermin mining cyborg icons

* roundstart borgs=2, spawn locations=4

* adds damage_protection mechanic

* add xeno_disarm_chance

* ERT borg naming scheme: (level) ERT (number)

* std borg: tweaks hypo, RMs holoproj, adds mats/subsystems

* AA bullet_arc refactor

* refactors var/require_module to be bool, proc/action() to return bool

Suggested by farie82

* better radio for generalist

* rework gamma borgs, split of destroyer borgs

* dead robots fix

* fixes error caused by merging of PR 12932

* manually fix line endings

* fixes borg energy weapons (except disablers) not being recharged within recharging stations

* add trailing newline to make travis pass

* compatibility with #13471 life refactor

* deletes change to gamma sec ERT laser beam energy cost

* refactor handling of ash/lava immunities

* removes spiderlike mining borg sprite

* tweaks generalist borg loadout

* limit secborgs to 1 on green alert / roundstart

* re-run icondiffbot

Co-authored-by: Kyep <Kyep@users.noreply.github.com>
2020-06-28 14:16:14 -06:00
variableundefined
0cee3ea089 Merge pull request #13636 from Fox-McCloud/remove-construction-site
Removes Construction Site
2020-06-27 00:08:49 -04:00
Fox McCloud
dc819638d6 Merge pull request #13670 from AffectedArc07/tcomms-rework-fixes
Tcomms rework tweaks
2020-06-26 22:10:39 -04:00
Fox McCloud
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
AffectedArc07
989d4514a4 Tcomms rework fixes 2020-06-23 12:52:58 +01:00
Fox McCloud
602a018bc5 fixes 2020-06-18 11:12:58 -04:00
AffectedArc07
d5409598f4 CE password 2020-05-17 11:23:40 +01:00
AffectedArc07
c76ffe6bde Maps stuff back in 2020-05-15 21:43:59 +01:00
AffectedArc07
f93146f6f5 DANNY DELETO - DNPR 2020-05-13 21:41:56 +01:00
Mars
e9ae6f1bd0 Refactor slogan_list 2020-05-03 11:07:22 +02:00
Fox McCloud
affa319fab Removes Console Screens (#12512) 2019-10-08 21:07:50 -04:00
SteelSlayer
e9d463576f Reaper cult sprite overhaul (#12513) 2019-10-08 20:55:16 -04:00
variableundefined
3ae71f7932 Merge pull request #12245 from Fox-McCloud/universal-damage
Universal Object Damage
2019-10-06 23:22:48 -04:00
Fox McCloud
67dc33ac3f for-the-strength-from-which-he-gives-is-unerring 2019-10-05 02:08:11 -04:00
Fox McCloud
5170f3fbae the-strength-of-this-world-fades 2019-10-04 19:34:08 -04:00
Fox McCloud
a97d050f4b Syringe Refactor. Overhauls Lethal Injection Syringe 2019-09-30 18:25:36 -04:00
Fox McCloud
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
Fox McCloud
cb8529cdb8 Makes Xenobiology Simpler. Removes Slimes (#12398) 2019-09-24 16:17:33 -07:00
Fox McCloud
652920ae3c Wizard Battlemage Armor (#12388) 2019-09-24 15:42:47 -07:00
Fox McCloud
62226851d9 Merge remote-tracking branch 'upstream/master' into universal-damage 2019-09-23 12:53:52 -04:00
Fox McCloud
efc79cfc7c Removes Bodyscanner Console (#12377) 2019-09-22 21:11:02 -07:00
Fox McCloud
184e4877e8 the-gates-of-hell-shall-not-prevail 2019-09-16 02:07:57 -04:00
variableundefined
18b270cb7e Remove the structure/chair/wood/normal subtype, moving all properties to its parent. 2019-09-11 00:28:27 -04:00
Fox McCloud
fde5769225 other vending machines 2019-09-08 10:59:04 -04:00
Fox McCloud
a54cac4887 foxes are canines 2019-09-05 19:18:24 -04:00
Fox McCloud
dca6d98f5f Refactors Corgis 2019-09-04 18:40:34 -04:00
Fox McCloud
1befa092be Adds Sandbags Reworks Security Barricades 2019-08-26 03:21:45 -04:00
variableundefined
10437672de Merge pull request #12029 from Shadow-Quill/More-Meta-Fixes
[META] [READY] MetaStation Fixes
2019-08-25 20:43:37 -04:00
Fox McCloud
f84963b626 fix 2019-08-25 18:35:37 -04:00
Fox McCloud
cb6df7092c Hardsuit Helmets Integration 2019-08-24 18:36:27 -04:00
Shadow
8df226b045 Update 2019-08-23 20:01:50 -05:00
Citinited
d3122bdf8c Removes pipe dispensers from atmos in delta, cyberiad, and metastation 2019-08-22 21:56:04 +01:00
Fox McCloud
a911957d11 more shuttle fans 2019-08-20 21:06:02 -04:00
Shadow
087f7d9aa0 airlocks! 2019-08-18 18:05:50 -05:00
Shadow
271e081e50 mergemap 2019-08-18 14:42:33 -05:00
Shadow
bd98cc100a undo what i did for draft, add changes 2019-08-18 14:36:07 -05:00
Mark van Alphen
f56854292a Add shuttle chairs (and fix newlines on all maps) 2019-06-07 03:39:24 +02:00
Mark van Alphen
fad735142b Water tile fixes and other minor fancy turf fixes 2019-06-06 00:09:19 +02:00
Mark van Alphen
650383aad1 ChangeTurf fix, incinerator starts off by default, Syndicate base fix 2019-06-03 05:53:56 +02:00
Mark van Alphen
bc91f78c93 Shuttle and map fixes 2019-05-08 22:05:11 +02: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
b5c322e00a Starlight/shuttle lighting fix 2019-05-04 04:30:13 +02:00
Mark van Alphen
e9a9326db0 Re-add starlight 2019-05-04 04:22:45 +02:00
Mark van Alphen
bbeb07abd2 More lighting fixes 2019-05-04 03:06:10 +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
variableundefined
dca417f652 Merge pull request #11319 from Arkatos1/ToolBots
Adds Floorbot color variants
2019-04-29 23:43:24 +08:00
Mark van Alphen
7fef96e38d Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs
# Conflicts:
#	paradise.dme
2019-04-21 23:27:23 +02:00