Commit Graph

324 Commits

Author SHA1 Message Date
qweq12yt
d2f11206bf changes to HoP access
he couldn't access cargo already, now it's just polished so they don't have weird cargo access that they can't use
2021-06-19 03:15:41 -03:00
qweq12yt
8481c41087 qm can announce to station 2021-06-19 03:15:38 -03:00
Suicidalpickles
6496b418d4 Update paramedic.dm 2021-03-08 18:31:34 -08:00
Letter N
754c24748e Merge remote-tracking branch 'origin/master' into hardsync-1.5 2021-03-03 17:09:01 +08:00
Letter N
de67720a0a icons should exist 2021-02-14 11:39:56 +08:00
Letter N
125cd17cee Merge remote-tracking branch 'origin/master' into rustsql 2021-01-20 15:40:41 +08:00
silicons
dedb0cb62e Merge remote-tracking branch 'citadel/master' into tgsync 2021-01-19 04:24:42 -07:00
necromanceranne
6650d3518a Mostly ports tgstation #54644; New roboticist labcoat sprites 2021-01-04 20:45:11 +11:00
Letter N
cd5d558fad safety? what's that?
* maybe table-breaking change
2021-01-04 11:57:12 +08:00
Letter N
56789c5924 firsthit-lib_machines 2020-12-31 16:46:40 +08:00
Letter N
51143f89e5 Merge remote-tracking branch 'origin/master' into semi-sync 2020-12-29 10:37:06 +08:00
silicons
92b2177316 Update _job.dm 2020-12-26 11:35:09 -07:00
Letter N
e9ca58446c Merge remote-tracking branch 'origin/master' into semi-sync 2020-12-23 12:25:24 +08:00
silicons
eaa5070870 Update _job.dm 2020-12-22 20:36:06 -07:00
Letter N
cf692e8426 subsystem upgrades 2020-12-14 15:28:59 +08:00
silicons
45a7c68da1 wow 2020-12-11 15:05:00 -07:00
silicons
21d3d8fcd9 sigh 2020-10-03 14:17:13 -07:00
Timothy Teakettle
5a33c049a7 wops 2020-08-25 16:59:26 +01:00
Timothy Teakettle
2fa40f588e let them stand 2020-08-25 15:26:03 +01:00
Timothy Teakettle
79fa9277a3 yes 2020-08-25 15:23:11 +01:00
Timothy Teakettle
f5300750b5 Revert "[TESTMERGE ONLY] FUCK" 2020-08-17 03:18:36 +01:00
silicons
4cd731ce11 Revert "cease your shitcode: cum edition" 2020-08-16 19:06:57 -07:00
Timothy Teakettle
033fe553e8 cease your shitcode 2020-08-10 21:41:06 +01:00
Timothy Teakettle
bbda8dbf79 make detective the same, remove blood and paraplegic 2020-07-27 18:48:44 +01:00
Timothy Teakettle
a057ceaa2a i too like my secoffs to not have blood deficiency 2020-07-24 15:31:02 +01:00
Timothy Teakettle
c6de85bae4 yes i too like sec being blind 2020-07-24 15:24:02 +01:00
Timothy Teakettle
974b80a2fd Merge branch 'master' into wound-port 2020-07-18 21:45:24 +01:00
Timothy Teakettle
a4478b0cda it continues 2020-07-17 22:38:28 +01:00
Timothy Teakettle
55af5f8ea2 give me my snails 2020-07-14 20:26:31 +01:00
Ghom
a2a2476243 Update shaft_miner.dm 2020-06-28 02:03:35 +02:00
deathride58
3eb3934e26 Adds Pride Month as a holiday! (#12436)
* Adds pride month as a holiday, complete with assistants spawning with rainbow jumpsuits

* yknow what, while i'm at it, let's compress it
2020-06-04 15:40:31 -07:00
kevinz000
616d104c23 Merge pull request #12189 from Ghommie/Ghommie-cit735
Skill modifier datums.
2020-05-14 04:46:24 -07:00
Ghommie
7fb96ab0cf Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit685 2020-05-12 20:06:59 +02:00
Ghommie
300331ccb7 Skill modifiers datum WIP. 2020-05-10 02:11:48 +02:00
Ghommie
2858ddd90b Porting "Refactors language holder" 2020-05-08 22:44:02 +02:00
Ghommie
f770586407 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit723 2020-05-05 05:09:29 +02:00
Ghommie
643ef48f0e Macros, generic skill implementations. 2020-05-05 04:42:34 +02:00
Lin
367bb0f71c Merge pull request #12072 from Psody-Mordheim/browhatifweusedallthejobslotsduringroundstart
Lets actually use all the positions
2020-05-05 00:49:25 +00:00
Ghommie
a194d7dafe merge conflict and job/dept discounts support. 2020-05-03 02:11:05 +02:00
Psody
42762c459e Lets actually use all the positions 2020-05-01 04:14:34 -04:00
kevinz000
866b3789ab ok 2020-04-25 01:54:26 -07:00
kevinz000
e6b0fb4929 this was a mistake 2020-04-25 01:02:47 -07:00
kevinz000
6c5d42b5f5 oh boy 2020-04-25 00:48:56 -07:00
Ghommie
4c6f1b622b Porting Goofconomy & co. 2020-04-17 07:48:11 +02:00
Linzolle
166370fb6c missed one 2020-04-14 17:55:22 -05:00
Linzolle
f828f4c4b7 Merge remote-tracking branch 'forrest/wewlad' into tos-compliance 2020-04-14 17:33:47 -05:00
ForrestWick
0a54f8a7a0 I'M SORRY MR GITHUB PLS DONT BEAT ME 2020-04-09 17:27:18 -05:00
Ghommie
c3faf94d8f WIP 2020-03-30 05:29:39 +02:00
Putnam3145
3d8084709b A dynamic rework: target threat levels (#11515)
* Starting a replacement of how threat works.

* no, we do it this way

* Added threat levels to jobs

* Added threat to... a lot.

* Updated for traitor classes.

* Fixed errors, except for one.

It's consistently giving me "maximum number of internal arrays exceeded (65535)". I have no idea what could be causing this.

* Added type annotation to GetJob.

* This one I should change though

* wow how'd that happen

* spammable means low threat

* Made story threat have initial threat level on average

* Made somet rulesets force if they won the vote

* )

* Gave EVERY job threat, added a config for it.

* Rebalanced some numbers

* Update code/game/gamemodes/dynamic/dynamic_storytellers.dm

Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>

* Removes mush threat

* Makes devil threat scale with form

* reviewing reviewer's review of reviewer

* Gutlunches can be friendly spawned, so no

* Also made forced-friendly mobs not count

Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>
2020-03-25 17:40:37 +01:00
Timothy Teakettle
62d1a1f734 cook now gets to choose their ingredient box + sushi ingredient box (#11590)
* Update miscellaneous.dm

* Update cook.dm

* fixes some bugs

* i broke something again and now fix it

* fixes remote, edits ingredient box contents

* even more wildcard items

who doesn't love eggs, grapes and various kinds of human meat? (skeleton meat is a thing for some reason, and thus it goes. IN THE LIST.)

* removes a random newline

* adds a newline to the end of the file i accidentally removed

* why was there a newline here too
2020-03-24 20:39:46 +01:00