Commit Graph

415 Commits

Author SHA1 Message Date
danni boi ca97f9a92d Windowpainter (#14888)
* adds a window painting tool

* Update code/game/objects/items/devices/window_painter.dm

Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>

* gigit

* edited code to match steelslayer's suggestion

* Update code/game/objects/items/devices/window_painter.dm

OOF thank you for catching that

Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>

Co-authored-by: danni-boy <32673848+danni-boy@users.noreply.github.com>
Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
2020-11-23 19:07:54 +00:00
Aquilar 8b8dd8f620 Adds a number of new implants (#14348)
* adds CNS jumpstarter, hacking arm, janitorial arm and botanical arm implants.

* Update code/modules/surgery/organs/augments_arms.dm

Co-authored-by: RedWolfie <13683223+RedWolfie@users.noreply.github.com>

* Update augments_internal.dm

* Update augments_internal.dm

* error correction.

* new name for jumpstarter

* Update augments_internal.dm

* grammar

* taking some suggestions.

* adding a safe spraycleaner for the implant.

* more suggestions

* evenmoarsuggestions

Co-authored-by: RedWolfie <13683223+RedWolfie@users.noreply.github.com>
2020-10-21 09:52:11 -04:00
Qwertytoforty fbb34fe482 Gives engi/medical borgs an abductor tool upgrade from the exosuit fabricator (#14341)
* Gives engi/med  borgs abductor upgrades

* Removes unneeded line

* Henks and Aquilars suggestion

Co-authored-by: Qwertytoforty <qwertytoforty@gmail.com>
2020-09-25 16:13:26 -04:00
Kyep be024bbbcc Merge remote-tracking branch 'ParadiseSS13/master' into skills_rework 2020-09-19 06:39:38 -07:00
AffectedArc07 ce2f0d401d Swings the axe on modular consoles (#14355)
* Swings the axe on modular consoles

* Experience will not save you in these parts
2020-09-19 09:36:56 -04:00
Kugamo 3df2f3ac4e Adds Botany Jugs, and fixes hydroponic trays draining sealed containers [now without map edits] (#14212)
* Adds Botany Jugs, and lid test for hydro trays

* adds 1u and 2u transfer amounts back to changed items

* fixed item references in some .dmm

* improves weed/pest killer jug sprites, and corrects overlays procs

* removes uneeded image def

* improves sprites further

* adjusts coloring of l4z reagant

* Buffs Jugs to 80u each (from 50u)

* balances nutrient vending numbers

* resizes jugs

* fixes conflict in .dmi

* Resizes Jugs again

* removes commented out code

* Fixes

* futher fixes

* Fixes some issues, adds sounds for jugs.

* reverts to using New()

* removes jug.dm and reverts all nutrient back to bottles
2020-09-18 01:14:19 -04:00
ppi13 0b23e89fa5 Balances the safety override module and Fixes #14172 (#14177)
* Change safety override tech requirement and make it only unlock weapons instead of having the same effect as emag
2020-09-16 10:06:49 -04:00
Kyep 995165ae38 fixes merge conflict 2020-09-15 11:39:00 -07:00
AffectedArc07 5367a8c9a9 Merge remote-tracking branch 'ParadiseSS13/master' into sm-monitoring-console 2020-09-14 22:34:09 +01:00
AffectedArc07 db560898a2 Merge pull request #14208 from TDSSS/stethoscope
added stethoscope to the autholathe
2020-09-06 10:11:16 +01:00
TDSSS c65940dc2e added stethoscope autholathe design 2020-09-01 15:10:25 +02:00
Oyu-De 52a17762fd Fixed "Equipement" to "Equipment" 2020-08-31 20:40:27 +03:00
Kyep e3b82a70a3 Replaces skills computer with skills HUD eyewear 2020-08-17 06:02:55 -07:00
AffectedArc07 9401b38450 Supermatter Monitoring Console 2020-07-29 22:56:08 +01:00
Mitchell c718a1688e FLASHOUT 2020-07-20 18:07:41 -05:00
SteelSlayer e8b64acaab Adds the airlock painter (#12687)
* Adds the airlock painter

* 5 am push, pls don't break

* uses assoc lists, add do_after, painter attack_self

* more upgrades

* remove random whitespace

* better logic

* initial over new, flags, manually sort the list

Co-authored-by: SteelSlayer <SteelSlayer@users.noreply.github.com>
2020-07-13 15:52:34 -04:00
Fox McCloud 1ec53a35b3 Merge pull request #13615 from TDSSS/xray-rnd
change tech requirement for xray implant
2020-07-07 13:41:58 -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
AffectedArc07 6fddb72efd Fixes bad tcomms board naming 2020-06-27 08:40:54 +01:00
AffectedArc07 8294741b50 Removes some old and broken features 2020-06-21 21:12:27 +01:00
TDSSS 1c6234cf31 change tech requirement for xray implant 2020-06-14 19:55:23 +02:00
Fox McCloud 9d755e4b00 Merge pull request #13446 from AffectedArc07/tcomms-overhaul
Telecommunications Overhaul
2020-05-25 18:51:58 -04:00
Fox McCloud bf796cf8fc Ports Cybernetic Ears (#13438)
* Ports Cybernetic Ears

* gosh darn new lines
2020-05-24 13:54:54 -04:00
AffectedArc07 d97a20aa3c Integrates NTTC + Other Stuff 2020-05-15 19:48:53 +01:00
AffectedArc07 64dc83846e Main part works. but we still got a long way to go 2020-05-14 22:46:26 +01:00
Fox McCloud faecf7cbfa Patch rework (#13062)
* Patch Rework Part 1

* applicator

* fixes

* fixes

* temperature settings

* single application patches

* additional

* new line fix

* fox  is a derp sometimes
2020-05-02 20:07:43 -04:00
AffectedArc07 04ba5c1cc9 File standardisation (#13131)
* Adds the check components

* Adds in trailing newlines

* Converts all CRLF to LF

* Post merge EOF

* Post merge line endings

* Final commit
2020-03-17 18:08:51 -04:00
AffectedArc07 5baaabe12e Merge branch 'master' into var/const-to-define 2020-03-09 10:33:59 +00:00
Fox McCloud cd857e378e Removes Creatable Video Cameras 2020-03-04 12:57:23 -05:00
AffectedArc07 c64bc93649 Replaces all var/const with #define 2020-01-28 21:25:20 +00:00
streather 683640de24 fixing autolathe type
fixed a typo, changed compressed matter cardridge to compressed matter cartridge
2019-10-09 23:44:59 +01:00
Fox McCloud c8eebd1b4b Adds Leather to Biogenerator (#12514) 2019-10-08 21:12:09 -04:00
Fox McCloud affa319fab Removes Console Screens (#12512) 2019-10-08 21:07:50 -04:00
Fox McCloud efc79cfc7c Removes Bodyscanner Console (#12377) 2019-09-22 21:11:02 -07:00
variableundefined 1dc8e66cbc Merge pull request #11772 from Couls/constructable-rechargers
[READY] Constructable Rechargers and machinery tweaks
2019-08-23 09:16:37 -04:00
Crazy Lemon 3313efed23 Merge pull request #11981 from Fox-McCloud/lavaland-update
Major Lavaland Update
2019-08-16 22:22:49 -06:00
variableundefined 11e9ecadbf Merge pull request #11894 from TheSardele/blender
Makes All-In-One Grinders constructable
2019-08-16 20:41:18 +08:00
Fox McCloud 3634687a88 Merge pull request #11374 from Quantum-M/removeTeleBoards
Removes telescience boards from RnD
2019-08-11 16:28:47 -04:00
Fox McCloud ee0447dad6 Major Lavaland Update 2019-08-10 22:36:55 -04:00
TheSardele a4485969db Cleans up some reagentgrinder code
Removes a double check and fixes the circuit board description.
2019-07-21 10:18:19 +02:00
TheSardele 30f313cb93 Makes All-In-One Grinders constructable
All-In-One Grinders can now be constructed from a machine frame using the appropriate circuit board, 2 manipulators and a matter bin.
2019-07-19 17:58:52 +02:00
Couls cf31a774a5 Rechargers can be built now
Rechargers now use capacitors as their stock parts and recharge faster depending on the quality of the recharger(may need balancing)
Can now also place smaller machinery on tables by clicking on the table while pulling them(microwaves and soda dispensers are some examples)
2019-07-01 01:19:17 -04:00
variableundefined 12b20b594d Merge pull request #11738 from evankhellparadise/portableseed
Portable Seed Extractor design
2019-06-29 09:23:22 +08:00
Evankhell caad8f8e5e Portable Seed Extractor 2019-06-21 20:06:06 -04:00
Couls fc2488c80e new medical category in mechfab 2019-05-13 01:36:11 -04:00
variableundefined 56977dc052 Merge pull request #11376 from Arkatos1/Cardboard
Cardboard can now be made in the Biogenerator
2019-04-29 23:08:16 +08:00
Arkatos1 85cb74bec5 Cardboard can now be made in the Biogenerator 2019-04-25 12:27:32 +02:00
Arkatos1 fea1721d80 Pill Bottles are now printable in the Autolathe 2019-04-25 00:01:57 +02:00
B.A.L d1f6ffc7aa Removes boards 2019-04-21 14:52:59 -07:00
CornMyCob de3d84124a plasma cutter changes 2019-04-05 18:56:20 +01:00