Commit Graph

8940 Commits

Author SHA1 Message Date
PacifistDalek
0c22bb3e7e Updating some of our food sprites to better ones from other codebases (#14694)
* Adding in new sprites for a bunch of crappy food sprites

* Adding attribution for Goon origin sprites

https://github.com/binarysudoku has relicensed the sprites requested for our use (relicensing means they don't have to go in a separate folder). I've included attribution notes on each sprite that I've taken, as per our license

* Added a bunch more sprite changes!

* forgot the holymelon

* Updating trash sprites for junk food, adding a space twinkie trash sprite
2020-10-25 00:16:13 -04:00
AffectedArc07
4bb6a4929f Merge remote-tracking branch 'ParadiseSS13/master' into pr/warior4356/14493 2020-10-24 09:51:04 +01:00
AffectedArc07
bb6a31ae10 TGUI RPD (#14702) 2020-10-23 16:08:07 -04:00
warior4356
25da16d6d4 Merge branch 'master' into corporate-comms 2020-10-21 19:14:17 -07:00
Kyep
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
PacifistDalek
f312297f9d A variety of minor food related fixes and tweaks (#14656)
* Changed Milo to Miso

* Update baked_goods.dm

* typo fix

* Revert "typo fix"

This reverts commit 3f6ca6a5b9.

* Revert "Revert "typo fix""

This reverts commit b67ed80d8d.

* Update food.dm

* removing beff and pepperoni

* adding onions as juiceable

* made drying grapes give you homemade raisins since homemade raisins were already in the code

* undo the onionjuice because it crashed my test server

* replaced the vomit cheese with vomit cheese substitute, removed beff and pepperoni, made weird cheese actualy spawn a weird cheese wedge

* updated enzyme name and description to match how catalysts actually work and how the enzyme already works in game (and has for almost a decade in game)

* Moved onion rings to the deepfryer instead of microwave

* makes the fries recipe actually makes sense, and makes it benefit from the upgrades of the processor (so you can get more fries)

* made macaroni and cheese names consistent

* moved two recipes to oven from microwave

* Wine comes from grapes ya dingus

* name fix

* made burger recipes consistent except for the big bite and super big bites

* yaki imo is baked whole sweet potato, not processed!

* Update code/modules/food_and_drinks/kitchen_machinery/deep_fryer.dm

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

* Update code/modules/food_and_drinks/kitchen_machinery/deep_fryer.dm

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

* Update code/modules/food_and_drinks/food/foods/pizza.dm

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

* made food names consistently lower case

Except of course for foods that are supposed to be brand names, like Space Twinkie or the BigBite burger

* Missed one

* Back to american mac 'n' cheese spelling

* Macaroniiiii

Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>
2020-10-21 09:40:27 -04:00
moxian
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
AffectedArc07
19df15ad21 TGUI Mirrors + CMA (#14648)
* TGUI Mirrors + CMA

* Forgot this

* Farie tweaks

* Optimisations
2020-10-19 14:16:20 -04:00
joep van der velden
9ef602bb1b TGUI labor claim console. Fix fifty stack dupes 2020-10-18 16:18:38 +02:00
Darkmight9
8782c2ca32 Culinary QoL update (#14610)
* Culinary QoL update

* Changed the culinary tool apron sprites
2020-10-17 13:30:44 -04:00
Iren
4a21b6787f Code Standarisation - Tank Distribute Pressure (#14562)
* Code Standarisation - Tank Types

* Tank Distribute Pressure Standardisation

* Anesthestic Tank at O2 Standard

* Update tank_types.dm

* Distribution Pressure Fix

* TANK DEFAULT RELEASE PRESSURE
2020-10-17 13:16:46 -04:00
warior4356
73d5361695 Merge branch 'master' into corporate-comms 2020-10-16 21:45:48 -07:00
SteelSlayer
01e81b98d1 affected pass 2 2020-10-16 16:14:18 -05:00
SteelSlayer
6b3c022be6 affected first pass 2020-10-16 16:14:06 -05:00
SteelSlayer
3a23a6b5b8 tgui rcd 2020-10-16 16:14:06 -05:00
variableundefined
e039b8e560 Rename all instances of "virgin" being used as a variable name to more appropriate and self-explanatory variable name 2020-10-15 16:11:11 -04:00
AffectedArc07
f40a8163ff Codebase Cleanup - 2020-09-27 (#14472)
* Codebase Cleanup - 2020-09-27

* Endings

* Forgot meta

* Farie Tweaks
2020-10-15 13:22:52 -04:00
TDSSS
59347d99a1 [Review Ready] New station goal: Bluespace mining tap (#12062)
* Initial stuff

* Lots of small changes to get this functional

* Objective aspect works

* Fancy sound and icons

* Polishing, tweaks, branch update

* Incorporates review comments, fixes merge conflcits, updates branch.

* Made it work again, after another rebase

* Rudimentary tgui port, UI needs serious prettying up but is functional

* Much prettier TGUI with slider

* More TGUI improvements

* removes code I have absolutely no memory of writing that seems useless

* code cleanup

* Review comments incorporated

* autodoc

* one more autodoc comment

* more review comments

* filler change

* Forgot one

* return value on delete fix

* disregard that, this is better

* now using qdel_list

* Crate now comes with instructions

* adjusted instruction wording

* tgui messed up, fixed now
2020-10-15 09:31:57 -04:00
Qwertytoforty
e596560604 Prevents flash / sonic powder from working on blob tiles again. (#14559)
* Prevents flash / sonic powder from working on blob tiles again.

* Update code/game/objects/items/weapons/grenades/flashbang.dm

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

Co-authored-by: Qwertytoforty <qwertytoforty@gmail.com>
Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
2020-10-14 23:43:03 -04:00
warior4356
74da3a3992 Merge branch 'master' into corporate-comms 2020-10-12 16:31:15 -07:00
AffectedArc07
13a0e7178f Merge pull request #14566 from farie82/mmi-borging-alert
Adds an alert to the ghosts before people borg a playerless MMI. Will prevent borging till the ghost is in the MMI
2020-10-11 10:07:16 +01:00
ZEUS\samcr
70c5d4b987 IPC First Aid Kit No Longer Has Oil 2020-10-09 14:35:44 -04:00
joep van der velden
8eaa959c4f Adds an alert before people borg a playerless MMI 2020-10-08 23:51:53 +02:00
AffectedArc07
3ee7d2e89e Merge pull request #14525 from FlattestGuitar/oc-donut-steel
fancier donut boxes
2020-10-08 17:11:42 +01:00
Mieszko Jędrzejczak
2d83dbdde0 /
Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
2020-10-06 14:00:36 +02:00
AffectedArc07
b9ac5c0f57 Merge pull request #14529 from Kiyahitayika/Morgue-Destroy-Fix
Morgue Destroy() Fix
2020-10-05 16:00:39 +01:00
Kiyahitayika
f804e46adc Update morgue.dm 2020-10-04 20:49:21 -04:00
TDSSS
dbd162dff3 Adds Atmospheric Anomaly (#14433)
* New anomaly

* spacing

* agent b B-gone

* ansaris request
2020-10-04 13:44:29 -04:00
AffectedArc07
561db683ad Merge pull request #13869 from Fox-McCloud/intercom-refactor
Refactors Intercomms For Less Processing
2020-10-04 18:37:24 +01:00
AffectedArc07
2b7c9c2b1f Merge pull request #14513 from SabreML/bnotice
Removes the 'bnotice' span class
2020-10-04 18:14:22 +01:00
Kiyahitayika
c48c6b59ff Update morgue.dm 2020-10-03 19:29:33 -04:00
Kiyahitayika
729c3a1923 Morgue Destruction Fix 2020-10-03 19:15:25 -04:00
FlattestGuitar
153147bcba donut box improvements 2020-10-03 20:34:33 +02: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
SabreML
3f8ee9b375 Removes 'bnotice' span class 2020-10-02 16:17:26 +01:00
warior4356
8004bc9349 Adds procedure radio to radios and intercoms for the correct jobs 2020-10-01 13:09:53 -07:00
AffectedArc07
26bbfb1175 Merge pull request #14495 from FlattestGuitar/door-speed-toggle
Add door speed changes to remotes
2020-10-01 12:32:38 +01:00
E-MonaRhg
9b31f9e645 Leather shoes from leather instead of laceup (#14488) 2020-09-30 20:25:45 -04: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
AffectedArc07
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
warior4356
ae818b140d Captain get's oversight by default 2020-09-30 13:16:14 -07:00
FlattestGuitar
b901b94018 change messages 2020-09-30 20:35:56 +02:00
FlattestGuitar
90537b5e0b Add door speed changes to remotes 2020-09-30 20:29:48 +02:00
warior4356
dbd9ea7be5 Adds Oversight radio to Magistrate, AI, Captain, NT Rep, and IAA 2020-09-29 23:21:27 -07:00
AffectedArc07
1a49f7db7b Merge pull request #14454 from Kyep/wiz_tele_scroll_fix
Fixes wizard teleportation scroll generating a warning to admins
2020-09-27 09:35:36 +01:00
Kyep
6416c457ce Fixes #9174 - humans buckled to xeno nests can still attack 2020-09-27 00:57:57 -07:00
Kyep
aa300ea6b8 Fixes #13702 - wizard scroll produces zlevel error 2020-09-26 20:24:04 -07:00