Commit Graph
11906 Commits
Author SHA1 Message Date
1b1f49ac81 Adds the Emergency Extraction Flare (#16220)
* Adds the Emergency Extraction Flare

* removes extra message

* Apply suggestions from code review

Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>

* Apply suggestions from code review

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

* All I ever get, is a pain in the ash... 🎵

* Affecteds requests part 1

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

* Use populate_contents

* Update code/modules/mining/equipment/wormhole_jaunter.dm

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

Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>
Co-authored-by: dearmochi <shenesis@gmail.com>
Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
2021-07-02 21:32:45 +01:00
QwertytofortyandGitHub 15b7a76c91 Fixes syndicate teleporter saving throw bug (#16287) 2021-07-02 19:39:58 +01:00
7413256cb8 Prevents ghosts from setting off mousetraps (#16274)
* Prevents ghosts from setting off mousetraps

* Update code/game/objects/items/weapons/storage/storage.dm

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

* Note to self: Do not be tired when commiting suggestions

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

Co-authored-by: dearmochi <1496804+dearmochi@users.noreply.github.com>
2021-07-02 16:20:12 +01:00
datloandGitHub 7de29bd81f Replace nukie jetpacks by oxygen tanks (#16101)
* Replace nukie jetpack by oxy tanks

* replace all harnesses
2021-06-29 11:46:43 +01:00
27fe4da2df Hand tele portals malfunctions teleport to random Z levels (#16126)
* thinking about portals

* affected's suggestion

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

* teleporter machine change

Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
2021-06-29 11:46:13 +01:00
bcb0cbe5cb Prevents built APCs from being hacked, Prevents AI from loosing points from apc destruction (#16192)
* Prevents built APCs from being hacked, prevents deconstructing apcs from removing malf points

* Spacing

* whoops

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

* Affecteds other suggestions.

* Grammer changes

Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>

* And autodoc for steel

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

Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>
Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>
2021-06-29 11:44:18 +01:00
warior4356 aec95fed48 Merge branch 'master' into holy-chapel 2021-06-28 20:31:34 -07:00
Qwertytoforty e4461eac09 Please don't break 2021-06-28 19:12:39 -04:00
c266b27aed Another small bugfix bundle (#16260)
* Closet examine

* Lit welder inhands

* Capitalisation

* Cyber organ eating

* Nukie reinforcements code

* Welding tool lathe cost

* Patch pack dropping

* Welding tool fix

* Spacing

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

Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
2021-06-26 22:57:27 +01:00
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
S34NandGitHub 672f900b40 fixes RPD eating TEG circulators (#16258) 2021-06-26 14:36:40 +01:00
SteelSlayerandGitHub eb5fa5080c Update robot_upgrades.dm (#16248) 2021-06-25 18:48:04 +01:00
hal9000PRandGitHub e4d1788088 Fixes singulo hammer sucking in ghosts (#16247)
* fix

* review
2021-06-24 20:02:32 +01:00
AffectedArc07andGitHub ed11899f11 Merge branch 'master' into toml-config 2021-06-23 08:44:32 +00:00
dearmochiGitHubdearmochi <>
b1fe555a79 Fix shower mist not going away on deconstruction (#16233)
Co-authored-by: dearmochi <>
2021-06-22 21:05:14 +01:00
S34NandGitHub 7c6e19850a Merge branch 'master' into solgov_ERT 2021-06-22 10:37:32 +01:00
SabreML b45ee602bd Merge remote-tracking branch 'upstream/master' into flyswatter-fix 2021-06-21 21:03:30 +01:00
Akira AkashiandGitHub f1ad48c450 remove \the from loom.dm (#16222) 2021-06-21 10:42:20 +01:00
S34NandGitHub 04628f7df4 Merge branch 'master' into tgglassfloors 2021-06-20 16:32:22 +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
hal9000PRandGitHub fc3185dcb6 fix (#16209) 2021-06-19 23:07:50 +01:00
AffectedArc07 841eb0d309 And this 2021-06-19 19:04:00 +01:00
AffectedArc07 aed6fed004 Removes some oldcode 2021-06-19 18:56:48 +01:00
SabreMLandGitHub dd02435095 Fixes secborg batons (#16196)
* Cell linking

* V2
2021-06-19 14:10:01 +01:00
hal9000PRandGitHub 45449da433 table climbing fix (#16203)
* table climbing fix

* TRUE/FALSE
2021-06-18 21:00:27 +01:00
acfcce6728 Do not run hack in /obj/structure/closet if not mapload (#13) (#16201)
Co-authored-by: Simon Ogorodnik <simon.ogorodnik@gmail.com>
2021-06-18 16:41:05 +01:00
S34NandGitHub 00de6dc6c1 Adds pref to remove internals pressure from status tab, adds it to inspect text (#16110)
* yeets the internals from status panel

* adds pressure reading to the tank inspect text

* Adds a pref toggle

* numbers are hard

* catchup with master

* Revert "catchup with master"

This reverts commit bb972cb110.
2021-06-17 10:30:30 +01:00
c55acec92b Makes E-Bolas as they should be. Noncyborg variants. (#16168)
* The E-bola is not a cyborg variant.

Returns E-bola break out time to 60, instead of 20.
Security bolas are limited supply and should be better then makeshift ones.

* whoops

Adjusts the breakout time to not to default to beartraps and use the 6 seconds listed in the Ebola item.

* Update code/game/objects/items/weapons/legcuffs.dm

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

Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
2021-06-17 10:25:24 +01:00
SabreMLandGitHub 75375efce9 Why is this a thing, really (#16169) 2021-06-17 10:23:14 +01:00
QwertytofortyandGitHub 4d26621d0b Fixes being unable to pickup the armblade nullrod on mining (#16189) 2021-06-16 10:02:58 +01:00
hal9000PRandGitHub 455836c189 fi (#16184) 2021-06-15 12:55:56 +01:00
S34NW 277b14275d hardsuit pass 1 2021-06-15 00:55:42 +01:00
S34NW ba45742fe9 loadout update, armour tweaks 2021-06-13 16:56:57 +01:00
AffectedArc07 efed543f47 Merge remote-tracking branch 'ParadiseSS13/master' into toml-config 2021-06-13 14:15:07 +01:00
QwertytofortyandGitHub 5896bd2c8e Fixes some exploits (#16134) 2021-06-07 18:46:16 +01: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
ppi13andGitHub aacae884ca Fixes #16019 (#16021)
* Fixes #16019

* Adds a way to 'drop' the kiss without throwing it.

* A better way to fix this

* Fixes fuckups, and make it work.

* Fixes #16019

Adds a way to 'drop' the kiss without throwing it.

A better way to fix this

Fixes fuckups, and make it work.
2021-06-04 10:50:03 +01:00
Sirryan2002andGitHub 98b97e02b0 Axes Ratvar_Act() from the code (#16025)
* Ratvar_Act() is no more

* fixes runtime with recipes

* readds removed brass objects

* Fixes an oopsie

* removes unnecesary procs
2021-06-04 10:49:12 +01:00
SteelSlayerandGitHub 27f8610b23 secborg charge fix (#16127) 2021-06-04 10:46:57 +01:00
AffectedArc07 f3c314f07b Merge remote-tracking branch 'ParadiseSS13/master' into toml-config 2021-06-03 18:10:19 +01:00
cd7017e1b3 Allows Maintenance Drones to see wire names (#16047)
* drone buff

* V2 (Item Trait)

* Indentation

Co-Authored-By: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>

Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>
2021-05-29 21:19:05 +01:00
LeanfrogandGitHub 4e63120df4 Makes Display Cases Emaggable (#16096)
* Emaggable Case

* Emag Alarm

* one space is kil

* the is kil
2021-05-29 21:13:30 +01:00
AdrerGitHubadrermail@gmail.com <adrermail@gmail.com>
740ac16074 sol trader lootdrop autosurgeon now of the organ subtype (#16098)
Co-authored-by: adrermail@gmail.com <adrermail@gmail.com>
2021-05-27 15:59:41 +01:00
Fox McCloudandGitHub bfc5895c7d Merge pull request #16056 from Bizzonium/fixAtmosLeak
Fix air leak through reinforced window that not updating atmos
2021-05-26 16:41:12 -04:00
4960f5440c Various Tweaks & Fixes (#15857)
* Stuff

* Grammar reviewer review

Co-authored-by: Sean Williams <12197162+S34NW@users.noreply.github.com>

* Shuttle call HTML fix

And multiline announcements too, à la #15645.

The clean_input() was causing the message to be encoded twice, and only decoded once. Removing it still encodes the string.

* Loadout revert

Co-authored-by: Sean Williams <12197162+S34NW@users.noreply.github.com>
2021-05-24 16:29:07 +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
AffectedArc07 968d1bc88d Merge remote-tracking branch 'ParadiseSS13/master' into toml-config 2021-05-24 15:30:20 +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
AffectedArc07 3bb24faec2 Sabre tweaks 2021-05-23 23:04:45 +01:00
AffectedArc07 7486d026b7 READY 2021-05-23 17:26:17 +01:00