Commit Graph
1237 Commits
Author SHA1 Message Date
6080189ea3 Fixes powersink not giving you a beacon on purchase. (#16255)
* powersink gives you a beacon, as described

* no longer a bomb subtype

* Update code/game/objects/items/devices/radio/beacon.dm

Co-authored-by: dearmochi <1496804+dearmochi@users.noreply.github.com>

* Update code/game/objects/items/devices/radio/beacon.dm

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

Co-authored-by: dearmochi <1496804+dearmochi@users.noreply.github.com>
Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
2021-06-26 21:34:08 +01:00
SabreMLandGitHub 0b375de42c Removes the the vast majority of 'The the' from the the code (#15597)
* The the

* Some more

* Review 1

* A couple more
2021-06-20 10:20:32 -04:00
9d10cf4260 Fixes soulstones ignoring DNR or AntagHUD settings (#16117)
* DNR/AntagHUD soulstoning

* Update code/game/gamemodes/wizard/soulstone.dm

Co-authored-by: dearmochi <shenesis@gmail.com>

* Revive rune

Co-authored-by: dearmochi <shenesis@gmail.com>
2021-06-06 12:43:28 +01:00
e4bbd94d6a Robot_module and cyborg stack refactor (#13527)
* robot_module refactor

* some fixes

1. adds medical stacks of 25 for the syndi medical borg
2. fixes various construction steps that weren't using `use()` or `get_amount()`

* review tweaks + other stuff

1. Makes a bunch of for loops into istypeless loops
2. Adds a readout of the current out of stacks a borg has, in the status panel
3. Slightly reorganizes the medical, syndi medical, engineering and syndi engineering cyborgs items

* fixes after upstream merge

* blank line for travis

* fixes and improvements

1. Fixed welder icon's not updating periodically if you were charging in a borg recharger
2. Fixes solar panels dropping /cyborg type glass when they were deconstructed.
3. Band-aid fix (incase #2 doesn't fix this) for cyborg stack's `source` var being null which resulted in tons of "cannot read null.energy" runtimes

* more fixes + constructable frame runtime fix

* removes toy sword placeholder

remove comment

* remove these as well

* .amount to .get_amount(), really should have done this before

* refactors robot_upgrades to work with the new system

- more cleanup
- adds documentation
- fixed a bug I made where you could delete your robot stack via crafting

* moves some unemag logic to the module file, makes more loops typless

* farie review

* fox review

* affected review and more TM bugfixes

* fixes comment

Co-authored-by: SteelSlayer <SteelSlayer@users.noreply.github.com>
2021-05-24 16:24:25 +01:00
663eff7b5e MAP ROTATION PART 2 (#12345)
* MAP ROTATION

* Tweaks + New additions

* Apply suggestions from code review

Co-authored-by: dearmochi <shenesis@gmail.com>

* Fixes improper naming

* Fixes map vote

Co-authored-by: dearmochi <shenesis@gmail.com>
2021-05-24 08:25:18 -06:00
SabreMLandGitHub 02164ad0f0 Operator typos (#16048) 2021-05-18 20:55:41 +01:00
S34NandGitHub 509c1d5638 Fixes rogue characters on strip menu (#16009) 2021-05-16 09:35:00 +01:00
SabreMLandGitHub 6481a50506 'Do Not Revive' verb for Ghosts (#15934)
* DNR

* Review things

Bound to be something I missed, but testing all seems to work fine.

* Aliven't
2021-05-02 15:42:56 +01:00
46144e3c07 Syndie Space Base (#15104)
* v1

* v2, floors

* more tweaks

* areas, powernet

* cleanup

* changed filename, added east wing, 6 slots

* syndi autolathe

* update ruins refs & config, delete comms agent

* IDs look properly syndie, names are randomized

* glass

* convert map file to TG map format

* del old file

* air alarms

* del navconsole, fix area tile

* AA request

* refactor

* AA requests II

* dorms symmetry

* deletes explosive plastitanium walls & self destruct device (from lavabase)

* add light to medical operating table

* atmos refill connectors

* add air canister and move meter in distro, add 2 portable air pumps

* improved vents

* tweaks pipes

* removes duplicate air alarm

* (PR req) replace areas/lathe/spawners with PR versions

* wrench, tele area icon, headset name

* player panel fix, replace /anyone ID with /researcher ID, ID.untrackable refactor

* fixes teleporter runtime

* "Syndicate Researcher" consistency

* cryo room

* delete syndiwrath

* default job on ID card for telecomms purposes

* add vents and airlocks

* air alarms toggle firelocks

* artvend

* trashbags

* revert alarm.dm

* delete rogue light

* update syndi lathe name, remove newscaster frame

* changes made necessary by atmos/redcross PRs

* fixes merge conflict

* update to fix conflicts with PR 15384 as well

* syndi teleporter now requires SYNDI_LEADER access, no more runtimes

* avoids making offstation cryopods always face right

* add scrubber net

* dmm2tgm

Co-authored-by: Kyep <Kyep@users.noreply.github.com>
2021-03-30 18:54:19 +01:00
QwertytofortyandGitHub 90d614653b Allows health scanners / ghosts to see cybernetic organs in health scan (#15705) 2021-03-30 12:10:10 +01:00
AffectedArc07 f2770ed6be Merge remote-tracking branch 'ParadiseSS13/master' into brutal-part1 2021-03-11 18:41:17 +00:00
Fox McCloudandGitHub 0dc46b7150 Merge pull request #15209 from SteelSlayer/spawn-removal
Removes a bunch of spawn()'s
2021-03-07 21:10:39 -05:00
Fox McCloudandGitHub 926d484277 Moves External Organs to Nullspace (#15548)
* Moves External Organs to Nullspace

* additions

* oops

* further cleanup
2021-03-03 21:34:49 +00:00
Fox McCloudandGitHub 75935ff876 Converts Eye Augments to Cybernetic Eyes (#15519)
* Converts Eye Augments to Cybernetic Eyes

* literally not used

* it helps when you properly include all the code

* flashlight eyes

* tweaks

* conflict resolution

* can't have two eyes

* order of operations matters here

* autosurgeon
2021-03-03 20:21:30 +00:00
Fox McCloudandGitHub f65c8994ce Broad TG Sound Update (#15608)
* Broad TG Sound Update

* jester update
2021-02-27 11:59:33 +00:00
SteelSlayer e57d867df5 spawn removals 2021-02-26 23:02:16 -06:00
Fox McCloudandGitHub c73cc5aa68 Refactors Organ Shocking To Use Signals (#15593)
* Refactors Organ Shocking To Use Signals

* proper source

* hush you
2021-02-26 18:43:11 +00:00
Fox McCloudandGitHub 20485c029b Pickup and Dropped Bugfixing (#15575) 2021-02-24 19:23:31 +00:00
Fox McCloudandGitHub efa3aecb61 Ports TG Pickup, Equip, and Drop Sounds (#15572)
* Ports TG Pickup, Equip, and Drop Sounds

* really
2021-02-24 12:51:59 +00:00
Fox McCloudandGitHub 02b9445b9b Refactors DNA Mutations; Refactors Mutations to use Traits (#15483)
* Refactors Mutations

* traits

* more work

* styling fix

* yet even more work

* oh hush

* almost there

* it continues yet further

* and that's genetics done

* and that's it folks

* last bit and golem fixup

* oof

* oops

* tweaks and fixes

* styling
2021-02-21 21:25:19 +00:00
SabreMLandGitHub 09e9eda072 Gives the Brig Physician medical comms (#15450)
* BP Medical channel

* And the spare headset too
2021-02-10 18:18:10 +00:00
Fox McCloudandGitHub aa86510c54 Turf Refactor, Part 1: Purging /turf/simulated/shuttle (#15454)
* Turf Refactor, Part 1: Purging /turf/simulated/shuttle

* everything but shuttle templates

* it is done

* titanium airlocks

* correcting multi-turfs
2021-02-07 11:06:55 +00:00
7b1ddc9c81 Makes the Contractor Kit a 20 TC uplink purchase (#15284)
* Makes the Contractor Kit a 20 TC uplink purchase

Increases Blackout cooldown to 45 minutes
Adds logging on target extraction

* Removes clear TP topic

* Non-traitors can no longer purchase the kit

* Update locate()

* Prevents vampires and changelings from buying

* remove spess

Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
2021-02-03 15:48:00 +00:00
AffectedArc07 f5f97882cf BRUTAL Part 1 - No proc var/ in procs 2021-02-01 14:10:08 +00:00
Fox McCloudandGitHub 82f1d2ce59 Improves Geiger Counters; Allows Toggle (#15366)
* Improves Geiger Counters; Allows Toggle

* no arg

* spelling

* tweaks
2021-01-30 23:22:21 +00:00
Fox McCloudandGitHub de795c4e31 Radiation Refactor (#15331)
* First Commit

* visible radiation and engine goggles

* correction

* t-ray fix

* further adjustments and fixups

* gieger addition and cleaning fixup

* yet more fixes

* styling fixes

* fixes

* human glowing fix

* do the merge conflict avoidance dance

* Update supermatter.dm

* supermatter rads

* mapping in

* radiation doors

* yeah yeah line endings

* clean up

* styling issues

* showers
2021-01-24 22:03:13 +00:00
QwertytofortyandGitHub a45cd040a2 Prevents diagonal teleports on the syndicate handheld teleporter (#15252)
* Prevents diagonal teleports

* Makes it use sprite direction on diagonal
2021-01-10 20:32:05 +00:00
09c125ff4d Adds the handheld syndicate teleporter (#14934)
* Start of this coding adventure

* Makes it work BETTER

* MORE BETTER. LESS GIBBING IN SPACE

* BOH interactions

* PR ready-ish

* Better checks, doesnt work in mechs

* Re-adds the windowpainter

* Boxes it, mashes it, sticks it in a microwave

* Revert "fixes merge conflicts pls?"

This reverts commit 1dc5e390be, reversing
changes made to 3ec24935bd.

* Revert "Revert "fixes merge conflicts pls?""

This reverts commit 53106e10f5.

* RE ADDS EVERYTHING

* Thanks henk for helping

* Affecteds code review suggestions

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

* Deletes it before re-adding it

* Now adds it in

* Affecteds other request

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

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

* Changes size, type casting, class, \n

Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
2020-12-16 15:03:23 -05:00
moxianandGitHub 1683c4271a Refactors renaming things with a pen. (#14960)
* Refactors renaming things with a pen.

* Farie review (thanks!!)

* Derp.

* Farie take 2
2020-12-16 14:43:15 -05:00
dearmochiandGitHub 5edee29a50 [READY] Syndicate Contractors (#14605)
* Syndicate Contractors initial PR

* Finalize initial version

DNP

Finalize initial version

* Baton now costs 6 Rep, show dead extraction penalty, fix scroll

* Reduce total TC, add zippo, balloon, icon tweaks

* Address moxian, AA and Farie

* Fix mode.txt

* oops

* Address Farie 2

* Tweak baton to work around stam crits, address SteelSlayer

* Address TM issues, TP menu

* Fix wrongly merged DME

* Tick contractor DM files again

* Remove step_y

* TC rewards always higher than preceding difficulty's reward

* Address Farie

* Remove extraction_turf from handle_target_return

* fix doc

* Merge part2

* Address AA again
2020-12-09 12:03:23 -05:00
AffectedArc07andGitHub 44012814d0 Merge branch 'master' into nanoui-is-dead 2020-11-26 09:34:14 +00:00
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
AffectedArc07 54dd2765b4 Converts all tgui_ to ui_ 2020-11-21 12:10:58 +00:00
AffectedArc07 984ac231e0 Nano Is Dead 2020-11-21 09:46:50 +00:00
moxianandGitHub 16d2638c0a Cardiac problems have a dedicated icon on medhud, not a generic "disease" (#14900)
* Cardiac problems have a dedicated icon on medhud, not a generic "disease"

* Rename "huddefib2" -> "hudflatline"
2020-11-18 18:08:01 +00:00
AffectedArc07andGitHub 4da9abeb50 Future proofs tcomms code (#14805) 2020-11-01 09:26:02 -05:00
997f527f3a Adds the emp bomb, and a beacon to summon it. (#14737)
* Adds the emp bomb

* Allows traitors to buy it, corrects mistake in syndicate uplink

Also prevents explosions from setting it off

* Update code/game/machinery/syndicatebomb.dm

Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>

* Update code/game/objects/items/devices/radio/beacon.dm

Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>

* steels suggestion

* Dave's request

Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>
2020-10-28 11:43:12 -04:00
AffectedArc07andGitHub ca29f5340e Runechat - stop bugging me for gods sake (#14141)
* Runechat - stop bugging me for gods sake

* Hotfix

* V2

* Patch 1

* Removes Radio

* Colour Sanity

* Fixes loc issues

* 2020-08-28

* LF --> CRLF

* Forgot this

* Fixes holopad stuffs

* Preference toggle existing!

* Drask + Kidan
2020-10-26 10:10:09 -04:00
warior4356 25da16d6d4 Merge branch 'master' into corporate-comms 2020-10-21 19:14:17 -07:00
f5a1a359a1 ERT Commander Rework (#14640)
* ERT Commander Rework

* instant = TRUE

Co-authored-by: Kyep <Kyep@users.noreply.github.com>
2020-10-21 09:44:37 -04:00
moxianandGitHub ed9c3a22e1 Make floor painter UI nicer and move it to TGUI (#14635)
* Make Dropdown component use `selected` prop instead of state.

This makes the selection properly update when it's changed server-side.

* Make floor painter preview available directions nicely.

Also migrate it to tgui while at it.

* Have a preview of all available styles with pictures.

Also address the review comments.
2020-10-21 00:12:38 -04:00
warior4356 74da3a3992 Merge branch 'master' into corporate-comms 2020-10-12 16:31:15 -07:00
AffectedArc07andGitHub 561db683ad Merge pull request #13869 from Fox-McCloud/intercom-refactor
Refactors Intercomms For Less Processing
2020-10-04 18:37:24 +01:00
warior4356 b157355763 Merge branch 'master' into corporate-comms 2020-10-02 17:04:04 -07:00
joep van der velden 83fb00a12b Flavor text 2020-10-02 21:45:27 +02:00
joep van der velden 51577e8695 Fixes camera bugs 2020-10-02 21:38:37 +02:00
warior4356 8004bc9349 Adds procedure radio to radios and intercoms for the correct jobs 2020-10-01 13:09:53 -07:00
warior4356 493941a022 Merge branch 'master' into corporate-comms 2020-09-30 15:40:56 -07:00
warior4356 f2875ead1b Renames to procedure. Moves to X. Fixes color 2020-09-30 14:51:56 -07:00
AffectedArc07andGitHub f9dd2de5f1 [READY] [TGUI] Uplinks, PDAs and Power Consoles (Dont question it) (#14403)
* Uplinks

* Main menu + Status display control

* Signaler + Homescreen Fixes

* TGUI Power Monitors

* PDA Power Monitor

* PDA Medical Records

* PDA Security Records

* PDA Secbot Control (Pain)

* PDA Mule Control (I hate this system)

* PDA Supply Records

* PDA Janitor Locator

* PDA Notekeeper

* PDA Manifest

* PDA Atmos Scanner

* Steel pass 1

* PDA Messenger

* Removes browserPDA-era icons

* PDA Nanomob (Why do we still support this thing)

* Fixes random power monitor quirk

* More steel tweaks

* Even more steel tweaks

* TM Tweaks Round 1

* \ref --> UID()

* Styling
2020-09-30 16:53:45 -04:00