Commit Graph

198 Commits

Author SHA1 Message Date
Qwertytoforty
55615f762a You may now stuff grenades in plushies. Adds the shark and abductor plushies from TG, non haunted branch (#21769)
* *cocks gun* branch's haunted

* branch is still haunted but we hired ghost hunters
2023-07-21 15:56:00 +01:00
Venuska1117
012e2c3052 Cerestation: Making Farragus Dirty (#21494)
* Making farragus dirty
- Now maintenances are dirty, and doors leading to them have chance to have dirt near them.

* test

* Changes:
- Remove "rare" dirt spawner.
- Add "maybe" and "often" dirt spawner.
- Fix "often" and "maybe" oil spawners sharing same path [...]/maybe, now they have their own paths.

* Fixing
-It now actually have changes stated before, for some reason it didn't save.

* Fixes Delta:
- Change 2 "rare" dirt spawners to "maybe" spawners, with remove issue.
2023-07-19 15:53:26 +01:00
AffectedArc07
8d7e066471 Adds OpenDream as a CI lint (#21099)
* Initial Commit

* Makes the CI work (maybe)

* Of course CI has a hissy fit

* Actually fixes the codebase

* Oops 1

* Tweaks

* oops
2023-07-18 20:50:31 -05:00
JimKil3
6ad882de48 adds them (#21085) 2023-05-22 22:25:09 +02:00
Venuska1117
b3a5fd773c Fixes (Oversight?) with fungus spawner from #16877 (#21057)
* Changed Fungus
- Now fungus dont spawn wall if roll fails.

* Apply suggestions from code review

Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>

---------

Co-authored-by: Farie82 <farie82@users.noreply.github.com>
Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
2023-05-22 22:06:30 +02:00
JimKil3
845c842f14 Renames Strange Reagent to Lazarus Reagent (#20614)
* the great renamining
also changes the description to be more flavorful

* capitalization
2023-03-26 12:04:02 +01:00
Samman166
f915a1d614 Removes smoke cluster grenades (#20331)
* Removes smoke cluster grenades

* removes regular hellwater grenades
2023-02-15 21:17:35 +01:00
Qwertytoforty
e40ef20c86 Pizza bombs can no longer be told apart, some pizza improvements (#20191)
* pizza time

* a batch of delicous pizza fixes mama mia

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>

* bool

* Apply suggestions from code review

Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>

* steels changes

---------

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
2023-02-08 13:07:36 -06:00
Henri215
c4667311e7 Janitorial equipment tweaks and cleaners availability (#20037)
* Janitorial equipment tweaks and advanced cleaner

* cleaner availability tweaks

* old cleaner for drones

* Mop capacity buff

* advanced cleaner for sol traders

* conflict part 1

* Merge branch 'master' into janitorial_tweaks

* Revert "Merge branch 'master' into janitorial_tweaks"

This reverts commit 47129ea819.

* Revert "Revert "Merge branch 'master' into janitorial_tweaks""

This reverts commit a8c520b069.

* hahahahaha

* hahaha part 2

* hahaha part 3

* cerestation edit

* adv cleaner comes with 500 now and ERT belt

* lube spray upper case and moving it to spray.dm
2023-02-03 13:10:51 -06:00
S34N
802408a923 Cere-station [100% free lag edition] (#19951)
* change da world

* compile, thanks

* Update cere.dmm

* Update cere.dmm

* ready for test

* use the proper name please

its CERE not ceres.

* stops shuttle from forcibly docking with podbay

* things are now different

Landmark update for job spawns.
More hardsuits in EVA, engi, and atmos.
Disaster counters properly added.
Vault is now more spooky.
Gamma armoury moved to below gulag shuttle.
Sleeping rooms replaced with arcade and swimming pool.
Captains ERP nest deleted.
Tcomms now looks like it was designed by a functional human being.
Mining doesn't need a weird glass box.
Shuffled docking ports at arrivals.
Windows are now reinforced windows.
Mr changs has arrived.

* disposals functions now

* now with 50% more air

* gamma armoury doesn't attempt to become one with gulag shuttle

* disposals net is airless, vault is enclosed in some rock

* standard number of escape pods

* slight fixes

* more bugfixes

* lighting fixes

* divided hallways, added psych office, more cams

* fire alarms, shutters, and fixes

* temporary DME edit to set cere as default map

* fixed shuttle runtime

* this compiles and runs locally, please CI

* fixes hidden double pipe

* more double pipes

* more vents and scrubbers, morgue body delivery

* tweaks to secbot pathing

* various QoL changes

* Medbay expansion, med+arrival maints expansion.

* the definitive air alarm update, and more!

* Departmental emergency EVA suits, signage, tweaks.

* 2 Cryodorms added (oops). Asteroid sound updates.

* Borg cryo, shutters correctly rotated.

* Supply shuttle edit. I like joining the map queue.

* minor fixes, grav gen isolation.

* minor fixes

* Disposal fixes, lighting adjustment

* SabreML feedback changes

* More minor fixes

* More fixes

* NSS Farragus

* (most) floors turn into asteroid sand, not spess

* reverted random file edit, fixed mr teeny

* minor fixes

* big bombs can breach asteroid areas

* Asteroid plating exists, did you know? I do now!

* camera network pass

* walls become sand too on destruction

* lighting pass

* implements feedback, dramatically reduces ores

* yeets ores entirely, sci break room added

* roundstart pads, more solars, bigger departures

* runtimes

* mining resistant rock

* variable names are important

* AoE KA doesnt affect rocks

* actually fix AoE stuff

* now with 1000% more bats

* no sandy cables, a brig exit chute, more head ssu

* mech drills are not pickaxes

* proc rename, perma window, faster sapce bridges

* Brig rework

* robotics changes

* More sci edits

* Rotayshun changes

* dme edit

* Delete cerestation.dm

begone, thot

* temp edit so it loads cere as default

* merge conflicts begone

* decal purge

* map repipe

* removes under-wall pipe adapters

* shuffled maint areas

* dirt purge

* longest bridge rework

* fixes

* PPI feedback

* kitchen does, in fact, need air

* permabrig tweaks

* restores cc changes

* merge part 2

* tag purge

* secret clown HQ got me shook

* SQUASHENING

* solar shuffle

* directional consoles

* remove TM edits due to rotation

* merge conflict part 2

* pod pilot deletion

* cold rock, window tint fixes, etc.

* further red rocks

* further tweaks

* more standardising

* robotics redo

* carpet time

* CI update for cere

* Apply suggestions from code review

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

* more squash, corridor cam removal, etc.

* light switches

* minor fixes

* temp cere default

* FOODCART!

* fixes

* no airless no more

* space_hall

* compat pass 1

* make it work

* more changes

* slimmening

* air alarm tweak

* TM commit

* ci tests

* final CI changes?

* squash. squeeze, optimise

* wall vent

* disposals fix, more squeezing

* bugfixes

* false walls

* bedroom culling

* edits and fixes

* tweaks

* changes

* det window

* further tweaks

* Revert "TM commit"

This reverts commit 9e8814937f.

* More TM only changes reverted

* fixes smoothing with falsewalls

* denth changes

* the airlockenning

* cicicici

* CICICICI

* further tweaks

* further tweaks

* reverts weird sand behaviour code from ages ago

* oops

* universal adapter my beloathed

* nanomap moment

* webmap

* cere nanomap

* feedback updates

* updates

* airlock tweaks

* vents and tweaks

* solars moment

* triple APC fix

* south of where?

* airlock helpers

* disposal flap purge

* outpost monitor with actual real networks?

* tweakeroni

* fixes

* fixes

* tweaks

* fixes

* medbay improvements

* power and flaps

* changes

* aa changes

* fixes

* more fixeronies

* fixes!

* reversed

* chemicals

* chem tweaks

* fixes

* shuttle fixes

* holopad pass

* editseditsedits

* lightslightslights

* door

* /obj/machinery/computer/security/telescreen/entertainment

* sonic underground

* actual sonic reference

* Apply suggestions from code review

Co-authored-by: Charlie <69320440+hal9000PR@users.noreply.github.com>

* Tsrc

Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
Co-authored-by: Charlie <69320440+hal9000PR@users.noreply.github.com>
2023-01-17 22:23:09 +00:00
Henri215
b4e970eb90 Added pie cannon and spirit board to Sol Trader items (#20100)
* Added pie cannon and spirit board to Sol Traders items

* Update code/game/objects/structures/spirit_board.dm

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

Co-authored-by: Farie82 <farie82@users.noreply.github.com>
2023-01-13 21:04:11 +01:00
AffectedArc07
1feb9fbd38 [READY] Atmos Refactor Part 7 (I think) - Kills signals + TGUIs stuff (#19867)
* I AM NOT A KING. I AM NOT A GOD. I AM LUNACY.

* THE SCOPE CREEP

* This was done in vi. No langserver. Send help.

* Progress

* Some issues fixed

* The code builds, but the maps dont

* CC builds, I doubt anything else does

* Do this now

* Safety

* The map compiles

* THE MAPPING HELL

* Airlock controllers dont work

* Fixed bombs

* AND THATS FIXED

* Phantom edit

* Restores LL I think

* The mapmerge hooks are actually retarded

* Fixes spawners

* Half working air control

* Picky

* Hyper efficient tank monitor

* Sanity

* Laying the framework

* Improved alert console

* Dont think this is actually done anywhere

* Metering

* ONE HUNDRED AND ~~EIGHTY~~ TWENTY SEVEN

* WE ARE READY FOR BOX TO BUILD

* One map done

* Well that was easy

* Another one

* I think this is done

* I should have removed this

* I would make a russian joke but <current event>

* Delta WIP

* Makes delta work

* Early review

* TM safeguard

* oops

* METAAAAAAAAAAAAAAAAAAAAAAAAA

* Fix #4213

* Trailing

* oh for piss sake

* Shutter fix

* Roundstart ATs can go away

* Review pass 1

* What could go wrong

* BOOM BOOM BOOM

* Not needed

* Fix seed vault

* Oops

* Review changes
2023-01-03 20:59:35 +00:00
Henri215
60958c580d adds wallets to lootdrop (#19691) 2022-11-24 22:43:42 +01:00
S34N
7dcd31990e Ports TCC style windows (#19488)
* window

* fix plasma window and spawners

* this now works well

* Apply suggestions from code review

Co-authored-by: Edan <29551695+Edan52@users.noreply.github.com>

* Empty-Commit

* Empty-Commit

* colour tweaks

* further colour tweaks

* last tweak

* edges

* false wall sanity

* Update code/__DEFINES/icon_smoothing.dm

* stealth conflict begone

Co-authored-by: Edan <29551695+Edan52@users.noreply.github.com>
2022-11-16 20:44:51 +00:00
Christasmurf
66e893ad2d Adds Suspicious Bomber Jacket (#19545)
* syndicatebomber

* armourmeup

* Update code/modules/clothing/suits/miscellaneous.dm

Co-authored-by: Sirryan2002 <80364400+Sirryan2002@users.noreply.github.com>

Co-authored-by: Sirryan2002 <80364400+Sirryan2002@users.noreply.github.com>
2022-11-03 18:01:31 +00:00
Contrabang
8b3c043746 cloth addition (#19480) 2022-10-26 00:25:11 +01:00
ElorgRHG
e843567671 Clothing (jumpsuit) DMI split, unused jumpsuit sprite purge along the way (#19092)
* Medical and RnD DMI files split

* Cargo DMI split

* Security DMI split

* Engineering DMI split

* Captain DMI split

* Civilian/service DMI split

This one hurt

* Forgot about this one

* Color DMI split

* Purges everything that was delted up until this point

... with a blindfold and a shotgun

* Dress and suit DMI split

* Pants and shorts DMI split

and merges pants and shorts files... shorts are pants, right?

* Donator/fluff jumpsuit clothing organisational relocation

* e

oops

* So this is used, repath bad

* Random commit

* Costumes DMI split and jumpsuits purge

* Some fixes

* pennywise

* Centcom DMI split

* SolGov DMI split

* Retro DMI split

* Syndicate DMI split

* Misc DMI split

* centcom officer

* Kills off uniform.dmi completely

* last fixes

* lastest fixes

* vox navy gold conflict

* civilian barber

* Tourist observers work now

* Hopefully working non-human humanoid clothing

* This being in suit.dmi is one of the reasons I made this PR

* This shouldn't be here

* Late night coding

* Pun Pun regains his drip

* Last fixes

* security/OFFICER

* Most important - clown fix

* working subtypes good

* Fixes chameleon jumpsuit

* Proper QM pathes

* Fixes jumpsuit rolling with the power of poor quality code

* Cargo tech character setup fix

* else instead

why didn't I do this in the first place

* PURP

* Fixes broken character setup job clothing

* CC suit fix

* Psychedelic jumpsuit proper path

* You must wear the jumpsuit to adjust it
2022-10-09 14:24:10 +01:00
Adri
4943029181 Removes red slime speed potion, replaces it with slime speed treat (#19194) 2022-10-01 15:50:43 +01:00
Contrabang
5e72865320 Mapping indictors for lootdrops are readable now (#19009)
* removes-the-colors

* forgot this
2022-09-12 22:31:40 +01:00
AffectedArc07
34ed47ae74 Refactors stack traces, tiny bit of cleanup (#18773) 2022-08-14 02:11:40 +01:00
Viz
949b73acf2 goodbye noobtrap (#18469) 2022-07-21 14:02:40 +01:00
Sirryan2002
f2813a6730 Complete Library Overhaul Part 1 (#17832)
* first edits

* more commits yay

* more changes

* Update paradise.dme

* changes

* more edits

* more edits

* changes

* more changes

* changes

* more stuff

stuff

Update tgui.bundle.js

* FUCK

* Many UI changes

* Update Lib Computer UI and Correct Map Issues

* squashed commits :)

Guts Old Book/Manual Code and Reworks it
final (almost) touches

* this should pass tests now

* fixes random ruin having a removed object

* adds review suggestions

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>

* squashed commits :)

update schema
adds python requested changes
implements proper python & sql scripts
applies some requested changes + minor fixes
bump SQL version to 40

Co-Authored-By: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>

* Apply suggestions from code review

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

* applies requested changes from code review

* lets pass some tests today

more fixes

* Apply suggestions from code review

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

* more requested changes fulfilled

* should fix map issues + a couple other things

* fixes & sanitization stuff

* Apply suggestions from code review

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

* updates UI and implements more requested changes

* mother of bug fixes & UI cleanup

* removes unused code

* Apply suggestions from code review

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

* fixes

* adds GC checks

* Apply suggestions from code review

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

* requested changes + TGUI Cleanup and Styling

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
Co-authored-by: Farie82 <farie82@users.noreply.github.com>
Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>
2022-07-09 14:55:12 +01:00
KalevTait
89ba9c047c Code Readability - Effects (#18150)
* effects

* removed anchored = TRUE from objects that inherit that property within the effects folder and subfolders
2022-07-02 16:48:46 +01:00
datlo
87be8664d1 Replace maint brown shoes by black shoes (#18125) 2022-06-29 14:38:27 +01:00
Vi3trice
8753e22a8e Rework toy card decks into standard decks (#17925)
* Go fish

* Keep forgetting about the map

* Forgot about the sprites for the double deck

* Cleaned things up

* Fix icon conflict

* Update cards.dm

* Improper tweaks

* Update cards.dm

* Axing the popup from the toy version entirely, that was a little jank

* Meta remap was merged

* Huh. \improper was the issue.

* Update cards.dm

* Few changes and a fix

* More changes

* Update cards.dm

* Update cards.dm

* Update cards.dm

* Merge branch 'master' into go-fish

* Update cards.dm
2022-06-27 22:38:15 +01:00
Bm0n
2f8ca5a845 Adds smoke bombs as maints loot (#18059)
* GRENADE!

* i just realised smoke grenades are far more powerful on paradise

* should be good now
2022-06-26 15:35:46 +01:00
S34N
705578b23b Energy detective revolver (#17771)
* Initial defines

* more work

* icon

* more stuff

* UID not hard ref

* tidying

* overload go brrt

* le sound and dead cell

* delet gap

* initial chargepack stuff

* simplify

* oops

* yeet this

* placeholder sprites

* oops magic number

* the gun speaks!

* consolidation

* tweaking and tidying

* so long old gun

* icon purge

* reapplies placeholder

* 1 minute tracker, not two

* makes it use a pinpointer

* revert tiny map changes

* cease your tracking, fool

* oops

* soft refs

* charlie review

* projectile ref to firing obj, removes testing overrides
& cleans up signals

* some more UID null checks

* ICONS

* ICONS CONFLICT

* MORE ICONS

* makes it freaking work

* first pass fixes

* charlie review

* charlie review 2, variable boogaloo

* fixes holsters

* colours the overcharged shot

* and recolours tracker to be yellow to match charge

* yellow laser icon

* widen overcharge misfire %

* fixes unlinkable pinpointers

* fixes gun not speaking when tcomms setup is changed

* steel request

* no chargey

* loudening 2022

* steel part 1

* Apply suggestions from code review

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

* restores missing sprites

Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>
2022-06-25 20:15:09 +01:00
S34N
970675a2c0 Refactors rusted walls and their spawners (#17969)
* refactors rusted walls and their spawners

* tidies this up a bit

* moxian review

* Apply suggestions from code review

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

* Update code/game/turfs/simulated/walls.dm

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

* more things

* Update code/game/turfs/simulated/walls.dm

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

Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
Co-authored-by: moxian <moxian@users.noreply.github.com>
2022-06-16 14:47:29 +01:00
Vi3trice
84cb9696f7 Refactor airlock spawner helpers to use access_txt and use cycle_interior/exterior for the door buttons (#17741) 2022-05-10 22:24:39 +09:00
AzuleUtama
0f3133eb25 Fixes certain Nuke Ops bundles using the wrong duffelbag sprite (#17717)
* sprites updated

* removes redundant icon/item states
2022-05-03 04:24:16 +01:00
Vi3trice
b70e4e9f7f Initialize lootdrop spawners and fix Sol trader vehicle spawn to have enough keys (#17586)
* Weeeee

* Right

* They have to call parent anyways
2022-04-12 18:16:26 +01:00
S34N
0cc1ebd46c [MDB Ignore] Refactors spawners, adds unique icons to spawner effects (#17238)
Co-authored-by: dearmochi <1496804+dearmochi@users.noreply.github.com>
2022-01-09 22:10:00 +01:00
Fox McCloud
06df88706f Beginnings of Combat Changes: Ranged Weaponry (#17075) 2021-11-11 21:24:02 +01:00
datlo
d94210031b Refactor C4, subtypes, and airlock ex_act (#16995)
* Refactor C4 and Airlock ex_act

* update uplink desc

* Replace ismob by carbon, clarify comment

* remove unnecessary ismob check

* replace destroy by qdel, fix comment

* auto doc comments, add else condition

* Add comment to shaped c4

* Shortens shaped boom proc, make airlocks more resistant against light ex
2021-11-05 10:12:09 +01:00
Fox McCloud
705768abd6 Merge pull request #17010 from S34NW/electrochromic_spawner_thingy
Passes ID var from window spawners to electrochromic windows
2021-11-04 14:09:34 -04:00
S34NW
84a027b2be crazylemon suggestion 2021-11-03 13:13:48 +00:00
S34NW
991da9a09b safeties 2021-11-01 22:33:34 +00:00
S34NW
816e478302 order of operations moment 2021-10-31 21:09:33 +00:00
S34NW
3d477b3427 leys you use id on spawners to pass them to windows 2021-10-29 20:44:11 +01:00
S34N
f01f5adae4 makes electrochromic window spawners use a unique icon (#16834) 2021-10-09 17:09:47 +01:00
S34N
952cfd7dc4 why was his done this way, wtf (#16877) 2021-10-04 20:17:00 +01:00
AffectedArc07
129318891d Nukes spacepods and associated jobs 2021-10-02 13:16:24 +01:00
Stokes52
119385057b Apply changes from AffectedArc's code review
Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
2021-09-19 07:43:00 -07:00
Stokes52
4942ef2444 Update lootdrop values to match the new items added 2021-09-19 07:42:53 -07:00
Stokes52
6c3675ad0c Add voice modulator mask for crafting and traitor uplink 2021-09-19 07:42:21 -07:00
S34NW
523c7786b2 spawner 2021-08-28 15:17:31 +01:00
Fox McCloud
4dffbd67ed Merge pull request #15139 from SabreML/rainbow-gibs
Species Gib Colours
2021-07-26 15:18:32 -04:00
Adrer
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
Farie82
e3ba0203b2 Adds grouped spawners. Makes spawning unique things easier. (#15956)
* Adds unique spawners
Makes spawning unique things easier.

* Refactor + comments update

* Some more info

* Slight refactor and path change.
group_id instead of key_override
comment changes

* File name change

* isnull check. Makes 0 as value valid
2021-05-16 11:41:06 +01:00
SabreML
0eaec89adb Soup Drinking (and custom soups!) (#15620)
* SOUP

* Space stuff

it compiled before I swear

* =
2021-04-15 22:04:24 +01:00