Commit Graph

20 Commits

Author SHA1 Message Date
Lucy
3d4f24603d Merge branch 'master' of https://github.com/yogstation13/Yogstation into katmos 2022-02-15 19:48:11 -05:00
Redmoogle
4ff4c79147 Makes the SMES display its capacity instead of precent and clarifies its charge (#12926)
* Autodocs, True capacity, and some modifications

* fixes children plus percentage

* Update Smes.js

* improve goals comment
2021-12-23 16:19:37 -05:00
Lucy
a50cbe7281 auxtools and katmos! 2021-12-17 17:59:11 -05:00
adamsong
3baeaeb0c4 Steals tg's span macros (#12232)
* Steals tg's span macros

* Fix alphabet

* Updated some more spans

* Misses a conflict

* Fix compile errors

* Converts more spans

* oops
2021-09-17 12:50:16 +01:00
Mqiib
aa8d559f93 PROPER UNITS (#12308) 2021-09-15 07:20:37 -04:00
ynot01
ab0f04f9b2 more department goals: medical edition (#11045)
* untested garbage

* Update medical.dm

* Update medical.dm

* div by 0

* Update medical.dm

* Update medical.dm

* Update medical.dm

* Update medical.dm

* Update medical.dm
2021-04-25 11:11:17 +01:00
swissloaf
51fbb4059c Adds station traits: Small modifiers that can randomly be chosen each round (#11134)
* Station Traits

* Update positive_traits.dm

* Test

* Revert "Test"

This reverts commit c99e3e9db5.

* Update sound.dm

* Update code/datums/station_traits/positive_traits.dm

Co-authored-by: Redmoogle <dakotamew@gmail.com>

* Update code/__HELPERS/priority_announce.dm

Co-authored-by: Redmoogle <dakotamew@gmail.com>

* Update ai_laws.dm

* Update traits.dm

* Update neutral_traits.dm

* Update negative_traits.dm

* Negative bot trait

* Update negative_traits.dm

* Adds an admin log hpoefully

* Update station.dm

* Update station.dm

* Update station.dm

* Update station.dm

* Update station.dm

* Update station.dm

* Update station.dm

* Removes custom alert message for now

* Update station.dm

* Update game_mode.dm

* Update extended.dm

* Update game_mode.dm

* Update dynamic.dm

* Update dynamic.dm

* Update extended.dm

* Update game_mode.dm

* Update dynamic.dm

* Update game_mode.dm

* Update dynamic.dm

* Update extended.dm

* Revert "Update extended.dm"

This reverts commit 2235319bb3.

* Revert "Update dynamic.dm"

This reverts commit 6af1fbaf60.

* Revert "Update game_mode.dm"

This reverts commit dd84d504dc.

* Try again

* Update game_mode.dm

* Let's test making them more common

* Medbot update

* Update negative_traits.dm

* Update negative_traits.dm

* tHNE great f

* Update traits.dm

* Update job.dm

* Update negative_traits.dm

Co-authored-by: Redmoogle <dakotamew@gmail.com>
2021-04-10 12:17:08 +01:00
Theos
39fa05bf02 BSA now respects its minute long cooldown (#11171)
* fix bsa

* apparently im the only person whos supposed to triple ensure people dont bypass stuff
2021-03-19 12:52:55 -04:00
ynot01
def0a07359 Moves the tesla cargo goal to engineering (#11059)
* tesla to engi

* Update engineering.dm

Co-authored-by: Theos <theubernyan@gmail.com>
2021-03-11 12:55:03 -05:00
Redmoogle
eefc676406 Certified Hood Classic (#11054) 2021-02-28 05:09:22 -05:00
ynot01
cba81db7e1 changes 500 uranium goal to 50 of every sheet (#11011)
* changes 500 uranium goal to 50 of every sheet

* sorted by rarity to reduce lag

* makes it look pretty

* strings

* separate var name

* Update cargo.dm

* paths

* Update code/modules/goals/department_goals/cargo.dm

Co-authored-by: Redmoogle <dakotamew@gmail.com>

Co-authored-by: Redmoogle <dakotamew@gmail.com>
2021-02-23 13:48:26 -05:00
Redmoogle
93aaf0f251 Safer code (#10884) 2021-01-16 13:23:15 +00:00
Theos
a43a0ceb0c prevents building a BSA on reebe (#10518)
* prevents building a BSA on reebe

* Update bsa.dm

* Update bsa.dm

* Update bsa.dm

* Update code/modules/goals/station_goals/bsa.dm

Co-authored-by: Jamie D <993128+JamieD1@users.noreply.github.com>
2020-11-27 22:31:04 +00:00
Jamie D
0dd6fae119 [Port] Explosions Subsystem Test 1 (#10202)
* Explosions Subsystem Test 1

* Fucking linter

* Fucking TG Are Dents

* SCREW OFF LINTER
2020-10-28 17:54:13 +00:00
Jamie D
10c9af0d77 Material datums - Moogle Helped - Check #10169 for more info (#10176)
* Hmm

* work please

* Fixes

* Ack

* REEE

* EEEE

* e

* e

* e

* STAND FIX

* Update code/game/machinery/autolathe.dm

Co-authored-by: Nichlas Pihl <nichlas00100@gmail.com>

* Update code/game/machinery/autolathe.dm

Co-authored-by: Nichlas Pihl <nichlas00100@gmail.com>

Co-authored-by: Nichlas Pihl <nichlas00100@gmail.com>
2020-10-28 17:53:59 +00:00
Jamie D
fb8eeb5a1f Tgui 4.0 - IN PROGRESS (#10116)
* Night 1

* Bit more

* MORE

* JS AND SHIT

* MORE

* IT COMPILES MOSTLY

* More and prepare for tgchat

* Woah there captain, TGUI 4.1 first.

* Shoo

* Copyshites

* Hmm

* Hmm

* Fixxxxx

* Fucking Apcs

* Fuck off autoupdate

* Rename DropDown.js to Dropdown.js

* Vending

* Few Fixes

* More Fixes

* Stand HO

* fixes sleepers without breaking anything else I think

* Oops

* Fixerinos

* Oopsie

* BUNDLE

Co-authored-by: Theos <theubernyan@gmail.com>
2020-10-25 18:34:06 +00:00
Nichlas Pihl
8f450217b9 Update cargo.dm (#10128) 2020-10-23 20:54:59 -04:00
Nichlas Pihl
0e902aaeca cargo tesla goal (#9469) 2020-09-14 19:47:38 +01:00
Nichlas Pihl
e7c79c5f7b Conditional department goals (#9457)
* just need to autodoc

* some autodocs

* autodocs SSYogs

* removes the cargo tesla goal
2020-08-15 15:05:25 +01:00
Nichlas Pihl
1094d2c618 Department goals (#9247)
* first draft of department goals

* line endings lmao

* goals now message peeps on creation/destruction

* AAAAAAAAAAA

* printing

* done?

* woops

* Update yogs.dm
2020-08-10 15:01:16 -04:00