Commit Graph
80 Commits
Author SHA1 Message Date
Henri215andGitHub 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
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
Henri215andGitHub 60958c580d adds wallets to lootdrop (#19691) 2022-11-24 22:43:42 +01:00
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
ContrabangandGitHub 8b3c043746 cloth addition (#19480) 2022-10-26 00:25:11 +01:00
ElorgRHGandGitHub 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
AdriandGitHub 4943029181 Removes red slime speed potion, replaces it with slime speed treat (#19194) 2022-10-01 15:50:43 +01:00
ContrabangandGitHub 5e72865320 Mapping indictors for lootdrops are readable now (#19009)
* removes-the-colors

* forgot this
2022-09-12 22:31:40 +01:00
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
datloandGitHub 87be8664d1 Replace maint brown shoes by black shoes (#18125) 2022-06-29 14:38:27 +01:00
Vi3triceandGitHub 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
Bm0nandGitHub 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
AzuleUtamaandGitHub 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
Vi3triceandGitHub 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
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
S34NW 816e478302 order of operations moment 2021-10-31 21:09:33 +00:00
Stokes52andAffectedArc07 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
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
SabreMLandGitHub 0eaec89adb Soup Drinking (and custom soups!) (#15620)
* SOUP

* Space stuff

it compiled before I swear

* =
2021-04-15 22:04:24 +01:00
2e4e0d2e91 Adds reactive teleport armor construction, ports repulsive armor from TG (#15343)
* Adds reactive teleport armor construction, ports stuff from tg to do it

* Adds description to what disabled does in code

* Fixes ashwalker tendril anomaly

* SaberML code suggestions

Co-authored-by: SabreML <57483089+SabreML@users.noreply.github.com>

* True or false

* Keeps reactive armors from triggering from kisses

* removes stun check

* oops

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

Co-authored-by: SabreML <57483089+SabreML@users.noreply.github.com>
Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
2021-03-30 11:55:31 +01: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 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 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
AffectedArc07andGitHub 2c37ae8fd0 The road to Initialize() stability - Enforcing parent call on New(), Initialize() and Destroy() (#14719)
* The road to Initialize() stability

* Fixes sanity, for now
2020-10-28 12:35:36 -04:00
Fox McCloudandGitHub 33af3fac4f Fixes Random Drugs failing Travis and Maint Loot (#13719) 2020-06-30 17:58:12 -06:00
AffectedArc07andGitHub 0c8d95dd65 Travis Update Finale: Unit Tests + SQL Validation (#13331)
* SQL Validation, the first of many

* Initial test of the world loading

* This was prefixed when it shouldnt have been :v

* This also isnt a valid table

* Escape time

* Chmod

* This **should** work

* Oops

* RUST gone bust

* Please work

* Why did I do this twice

* I think I got it

* Fixes AFK SS

* AAAAAAAAAAAAAAAAAAAAAA

* Fixes AI cam runtime

* Cleanup

* *screams*

* Fare fixes

* Removes un-needed stuff

* I hope this works

* chmoooood

* SQL Version Unit Test

* Failure test

* Kinda ironic how I forgot this

* Task failed successfully

* Moves a global var around

* Bump SQL version in travis

* New test: SQL example DBconfig update

* Lets test an invalid version

* TASK FAILED SUCCESSFULLY

* Programmatic maplist generation

* Removes a duplicate check

* Lets try this

* What about this

* hnnng

* Lets just update BYOND
2020-06-27 01:26:58 -06:00
Fox McCloud 360c29008e Minor Vehicle Refactor and Balance 2019-09-27 19:59:38 -04:00
Terilia b281d26ac1 Added Donksoft Sniper to the spawn pool 2019-06-04 13:33:12 +01:00
Mark van Alphen e9d39b0d27 Chameleon overhaul 2019-05-01 20:59:41 +02:00
Kyep 28ae61ee2c +talisman, -midgitSE, +cluster grenades, -goliathhide, +KAmodkit, +bartenderkit, +chefkit, -bananade 2019-01-10 17:24:55 -08:00
Kyep e69c74259a adds BoH/nvmeson/matscanner/thermals, moves speed potion 2019-01-10 16:01:46 -08:00
Kyep dd2808313e adds bluespace rpd, removes strange object 2019-01-10 15:36:12 -08:00
Kyep 51279caafd adds healgland, cycler shotgun, enforcers, oxytank 2019-01-10 15:19:41 -08:00
Kyep 787aee9655 replace trade objectives with 15 plasma bars & 10,000c 2019-01-10 15:16:59 -08:00
Kyep 8a4461c89e tweaks comment 2019-01-09 00:04:47 -08:00
Kyep ee5c6421a6 spacing 2019-01-07 22:52:52 -08:00
Kyep bf9d0b088f merge conflict fix, reset map 2019-01-07 16:37:07 -08:00
variableundefinedandGitHub 25f4665da7 Merge pull request #10580 from datlo/capufakedeath
Capulettium/Capu+ fakes death convincingly
2019-01-06 16:12:56 +08:00
Kyep 29e62bf0bc blue snowmobile 2019-01-03 20:49:33 -08:00
datlo 244fcfc739 capu/capu+ fake death for realsies, add fake death pills to syndis/maint 2019-01-02 09:46:03 +00:00
Mithrandalf 0e9191cdd4 Adds the cuffs to the code and the map 2018-12-27 17:01:40 +00:00
Kyep 46acb9338b sunglasses, seeds, KA, IMS, fleshy 2018-12-22 14:16:25 +00:00
Kyep 702f4db165 outfit, vehicles, paperfix, viruses 2018-12-12 00:31:56 -08:00
Kyep c49892c17d Desolate's suggestions 2018-12-10 17:06:45 -08:00
Kyep 4427d02acd researchnotes, pills, injector runtime 2018-12-09 00:41:11 -08:00
Kyep 7c1f40ea14 WIP omnizine/SR/virus bottles, minerals 2018-12-08 19:33:21 -08:00
Kyep 23eb2bb956 v1, WIP 2018-12-08 04:03:09 -08:00
AzuleUtama 9f0c127d9a Add syndi cigs to maint loot
Since an item classed as legal can only be gotten on the uplink right now.
2018-11-21 11:21:24 +00:00