Commit Graph

903 Commits

Author SHA1 Message Date
SabreML
02fe0876f5 Fix bundle #3 (#16411)
* Explosive implant

* Package wrapper

* Venus human trap sprites

* Vine damage

* Wisp vision

* Display case

* Storage viewing

* Ghost poll nullspacing

* Inflatable barrier piercing

* Pneumatic cannon

* Cow grammar

* Centcom jaunting

* Consistency

Not actually a lazy list, as far as I can tell

* Review 1

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

* Review 2

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

* length()

Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>
2021-08-05 11:04:27 +01:00
SabreML
6b326123ac DNR ghost spawns fix (#16458) 2021-07-30 14:57:36 +01:00
Fox McCloud
2bcb5ef403 Merge pull request #16359 from Edan52/gc-tweaks
Simple mob GC Optimisations
2021-07-26 15:48:56 -04:00
SabreML
865b19263c I am an idiot (#16421) 2021-07-25 11:37:15 +01:00
SabreML
fe6e445760 Manual ore redemption (#16414) 2021-07-24 10:26:07 +01:00
Farie82
64930de41c Makes all toy figurines tiny and refactors the code behind it (#15368)
* Makes toy figures tiny and refactors the code behind it

* Apply suggestions from code review

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

* atom_say and capitalize names

* Web edit baby

* Merge conflict fixes

* Init instead of New

* prize_ball instead of mechball

* prize_ball should not be a figure. Revert but keep the Init change

Co-authored-by: joep van der velden <15887760+farie82@users.noreply.github.com>
Co-authored-by: dearmochi <shenesis@gmail.com>
2021-07-15 13:59:26 +01:00
Edan52
e81cfee52a gc tweaks 2021-07-14 01:00:27 +01:00
dearmochi
712721fbc6 [READY] Reworks and Refactors Hallucinations (#15360)
* Hallucination rework start

* Chaser/Attacker, Abduction

* Moderates

* Majors

* saber alter

* address SteelSlayer

* Fix admin logging and runtime

* put hallucination logging on ATKLOG_ALL
2021-07-13 14:27:14 +01:00
SabreML
102e42a381 heck (#16344) 2021-07-11 17:32:19 +01:00
hal9000PR
9f008f3de4 jacobs ladder removal from tendrils (#16324) 2021-07-09 11:21:20 +01:00
SabreML
b9a4929235 'Fit Viewport' & Scoreboard refactor (#16294)
* Fit Viewport V1

* Scoreboard

* Moderate scoreboard refactor

Mostly just removing the global variables, since Mochi has plans for a proper big scoreboard refactor in the future.
2021-07-09 11:18:05 +01:00
Qwertytoforty
f8bc686abb Adds the B.S.G (#15798)
* Adds the 100% original and serious BSG

* Adds sprites

* prevents divide by zero

* Adds to protolathe, shield from projectiles, prevents hitting through walls

* adds sprites for inhands, pain, and suffering

* Finished the gun sprites.

* Adds admin version, sound effect, visual

* moves chain to base projectile, adds shitty sprite for bsg explosion

* Fixes it, maybe.

* I hate merge conflicts, gun sprites are back

* I need this, it seems.

* re-adds sprites back

* Prevents turrets from working with BSG, adds a variable for it, heavily nerfs the BSG stun to be more of a trip

* Apply grammer and spaceing suggestions from code review

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

* Makes the code clearer, use update icon, fix shaded charge

* Better inhands, tweaked base sprite

* Better explosion effect, mochi suggestion, PR ready

* Accidently removed this

* I did not intend to put this in, I discarded this change

* Update settings.json

* Spelling and return removal

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

* Removes spawn, makes it a callback

* Lowercase states

Co-authored-by: dearmochi <shenesis@gmail.com>
Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
2021-07-08 22:48:54 +01:00
Qwertytoforty
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
SabreML
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
Qwertytoforty
4d26621d0b Fixes being unable to pickup the armblade nullrod on mining (#16189) 2021-06-16 10:02:58 +01:00
Farie82
7f6a28f16d Respawning using anomalous crystal exploit fixes (#16165)
* Ahud anomalous crystal fix
Makes it so that you can't get around ahud enabling using the anomalous helper crystal

* Merge conflict fix thing
2021-06-12 18:13:42 +01:00
S34N
ddacfbb009 fixes exploit (#16164) 2021-06-12 16:22:35 +01:00
Qwertytoforty
5896bd2c8e Fixes some exploits (#16134) 2021-06-07 18:46:16 +01:00
SabreML
76e237edc5 Fixes HUD sunglasses deconstruction (#15444)
* sunglasses

* Unit test test

* Unit test test tested
2021-03-14 13:17:20 +00:00
hal9000PR
6232f9e196 Nerfs drake form. (#15235) 2021-03-14 10:27:20 +00:00
Qwertytoforty
9ee679cded Adds more magic items and spells to the wizard spellbook (#15036)
* touches more or less everthing that is magic

* Other changes I forgot to put in

* removes extra s

* nevermind lets not do drake form

* Apply suggestions from code review

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

* Better variable name

* Heart curse removed

* Re adds new stuff

Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>
2021-03-14 10:15:05 +00:00
AffectedArc07
f2770ed6be Merge remote-tracking branch 'ParadiseSS13/master' into brutal-part1 2021-03-11 18:41:17 +00:00
Fox McCloud
f65c8994ce Broad TG Sound Update (#15608)
* Broad TG Sound Update

* jester update
2021-02-27 11:59:33 +00:00
Farie82
89824404da Makes the coinpress respect inventory limits (#15202)
Co-authored-by: joep van der velden <15887760+farie82@users.noreply.github.com>
2021-02-21 21:43:38 +00:00
Fox McCloud
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
Fox McCloud
adc6dd7a11 Purges Unsimulated Turfs: Touches Up CC Areas (#15527)
* Purges Unsimulated Turfs: Touches Up CC Areas

* 2 additional turrets
2021-02-16 11:44:21 +00:00
Ryal
70a130ee61 Fixes formatting on request console logs (#15505)
* Fixes formatting on request consoles.

* Update requests_console.dm
2021-02-13 13:22:16 +00:00
Qwertytoforty
8f9ab3dac6 Prevents the possessor crystal from possessing bots (#15424)
* Prevents the possessor crystal from possessing bots

* Update code/modules/mining/lavaland/loot/colossus_loot.dm

Co-authored-by: Farie82 <farie82@users.noreply.github.com>

Co-authored-by: Farie82 <farie82@users.noreply.github.com>
2021-02-10 18:21:29 +00:00
Fox McCloud
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
Fox McCloud
6074323192 Further Updates Windows (#15427)
* Further Updates Windows

* correction
2021-02-03 10:04:52 +00:00
AffectedArc07
f5f97882cf BRUTAL Part 1 - No proc var/ in procs 2021-02-01 14:10:08 +00:00
Fox McCloud
003a1f7cba Tank Refactor; Breathing Retool (#15371)
* Tank Refactor Breathing Retool

* missed maps and doc

* just in case
2021-01-28 20:57:37 +00:00
Fox McCloud
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
Qwertytoforty
c946d5ee2b Less instant death of captain (#15301) 2021-01-20 09:53:44 +00:00
AffectedArc07
43ee2488c7 More New() -> Initialize() for /obj/structure (#15158)
* More New() -> Initialize() for /obj/structure

* Updates these

* Tweaks + Fixes
2020-12-29 10:42:39 -05:00
AffectedArc07
8f72d7556e Annihilates the blackbox (#15132)
* Lets get this show on the road

* Now were talking

* These matter

* Oh the joys of CI testing

* And this

* Wrong version

* Tweaks

* More tweaks

* Lets document this

* This too

* Upgrades this

* Fixed some sanity issues

* This too

* Screw it, this too

* More sanity

* And these

* This too

* Documentation

* This too

* Fixes **awful** scoreboard logic

* Why do we care about only half-absorbing someone

* Revert "Why do we care about only half-absorbing someone"

This reverts commit 8de1cfdf05.

* Refactors these

* Hashing

* Moxian tweaks
2020-12-24 16:06:48 -05:00
Nazsgull
a90b34d1fd Hierophant staff nerf (#14018)
* Hierophant club will now malfunction on station

If you are on station and try using it, it will only spawn a few sparks.

* Revert "Hierophant club will now malfunction on station"

This reverts commit 89d48dbc07.

* Nerfs Hierophant club so it cannot be used on station

Now if someone uses it onboard it will malfunction

* Gets rid of "timerMalfunction" var

* Timer refactor

Makes only one check for timer, instead of doing two

* Removes unused variable

* Refactors hierophant to early return

As suggested by farie82

Co-authored-by: awdaw <uo251631@uniovi.es>
2020-12-22 18:44:19 +00:00
AffectedArc07
f3d903acf3 Makes closets Initialize() (#15137) 2020-12-20 08:25:29 -05:00
Nazsgull
1123476af6 Nerfs Lava Staff (#13971)
* Nerfs Lava Staff so it cannot be used outside mining z level

Added  a timer and a spark system to spawn sparks when lava staff malfuntions.

Lava staff will check what z level is his user on, and if it's not mining will only spawn a few sparks.

* Updates description

Old description made little sense as lava staff will no longer work at the emergency shuttle.

* Update code/modules/mining/lavaland/loot/ashdragon_loot.dm

Adds spaces between method call parameters.

Co-authored-by: Kyep <16434066+Kyep@users.noreply.github.com>

* Removes unused spark effect system

Since I'm using do_spark() I don t really need a whole spark system.

* Gets rid of "timerMalfuntion" var

Instead of using 2 variables to do the same, "timer" will now control the cooldown for when the staff works and for when it malfunctions.

* Removes unnecesary time check

* Update code/modules/mining/lavaland/loot/ashdragon_loot.dm as suggested by @farie82

Co-authored-by: farie82 <joepvelden@hotmail.com>

* Update code/modules/mining/lavaland/loot/ashdragon_loot.dm as suggested by @farie82

Co-authored-by: farie82 <joepvelden@hotmail.com>

Co-authored-by: awdaw <uo251631@uniovi.es>
Co-authored-by: Kyep <16434066+Kyep@users.noreply.github.com>
Co-authored-by: farie82 <joepvelden@hotmail.com>
2020-12-16 15:28:11 -05:00
Edan52
fdc3a9fe2e Makes Bubblegum fightable (#13202)
* nerf

* remove other loot
2020-12-16 14:55:15 -05:00
dearmochi
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
dearmochi
0e15d69971 [TGUI] Ore Redemption Machine (#15016)
* [TGUI] Ore Redemption Machine

* small thing
2020-12-05 11:04:46 +00:00
Oyu-De
5816aa3dc3 Gets rid of <br> on science request console (#15029)
* Fixes <br> not being rendered properly

<br> on request console was just showing up as <br> so changed it with \n thanks to help I got on discord. it is still horrible, but less horrible.

* Update machine_redemption.dm
2020-12-01 13:44:49 +00:00
dearmochi
b69c4754b7 Fix AIs ejecting IDs in Mining Vendors to their core (#15018) 2020-11-30 08:48:09 +00:00
AffectedArc07
4996ac3373 Merge remote-tracking branch 'ParadiseSS13/master' into nanoui-is-dead 2020-11-27 10:21:41 +00:00
Kyep
4a944658ad [TGUI] Upgrades Bots (#14871)
* secbots, ED209s, cleanbots

* Apply suggestions from AA code review

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

* fluid buttons, Restore Safties

* pai rebuild

* deletes all spacing from data list

* katana needs_permit

* lava/storm/boneaxe needs_permit

* check s_store

Co-authored-by: Kyep <Kyep@users.noreply.github.com>
Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
2020-11-27 09:56:02 +00:00
AffectedArc07
44012814d0 Merge branch 'master' into nanoui-is-dead 2020-11-26 09:34:14 +00:00
dearmochi
41d6fd9630 Fix marker beacon duplication exploit (#14973) 2020-11-23 12:23:03 +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