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
Ghommie
86898cc451
Force pushed updates
2020-03-22 01:43:19 +01:00
Seris02
cccd0e9eef
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into tggenetics
2020-03-09 16:49:32 +08:00
kevinz000
274b9c28b3
Merge pull request #11264 from Ghommie/Ghommie-cit592
...
fixing a couple silicon privileges runtimes. Also .dme alphabetic order
2020-03-08 11:10:30 -07:00
Ghommie
a817bd6115
Porting the musician and curator beacons.
2020-03-07 00:12:50 +01:00
ancientpower
56ba8ef127
requested changes
2020-03-01 12:45:00 -06:00
ancientpower
5c5ec541ae
Merge branch 'master' into paramedic-tweaks
2020-02-29 01:55:46 -06:00
ancientpower
23c3e5b328
tweaks for the tweaks
2020-02-28 00:17:28 -06:00
ancientpower
12ba71f588
paramedic tweaks
2020-02-27 23:23:44 -06:00
Ghommie
ecf125477f
fixing a couple silicon privileges runtimes. Also .dme alphabetic order
2020-02-27 13:11:14 +01:00
Ghom
bfe3bbb6d5
Update paramedic.dm
2020-02-27 12:34:13 +01:00
Detective Google
569ea6bd61
unfucks paramedics access + PDA
2020-02-24 16:36:45 -06:00
Detective-Google
0caed52ca5
removes the epic and cool access and makes it less epic and more cool
2020-02-24 03:28:33 -06:00
Seris02
c3ec44b0d0
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into tggenetics
2020-02-22 19:54:10 +08:00
Detective Google
141bd96430
man FUCK psychs
2020-02-20 22:46:37 -06:00
Detective Google
4c10c830bf
Merge remote-tracking branch 'upstream/master' into psych+paramedic
2020-02-20 22:17:55 -06:00
Detective Google
a8f863f901
changes - sprites
2020-02-20 22:17:47 -06:00
kevinz000
7ee04aa608
Merge pull request #10998 from Ghommie/Ghommie-cit569
...
Something about the in operator and spaceDMM version update.
2020-02-15 12:17:37 -07:00
Seris02
2d9c8ce8fc
fixing merge conflicts
2020-02-15 15:41:52 +08:00
Ghom
2ed19e0a5a
Merge pull request #10861 from ancientpower/far-sliding-port
...
Ports /vg/station drink sliding
2020-02-12 09:06:03 +01:00
Ghommie
c34714cb90
Something about the in operator and spaceDMM version update.
2020-02-10 07:37:59 +01:00
Seris02
4ec99a38e2
merge fixes
2020-02-07 15:28:05 +08:00
ancientpower
937f6356ab
vgstation drink sliding
2020-02-02 13:26:16 -06:00
Ghommie
32ee2f6197
minor pet peeve with the anomalous honking crystal & co.
2020-01-24 21:51:24 +01:00
Seris02
74be93a8cc
hasSiliconAccessInArea vars change
2020-01-21 11:44:49 +08:00
Seris02
04b34ec8ed
hijack implant
2020-01-18 18:04:31 +08:00
Seris02
16b5c83a3a
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into tggenetics
2020-01-13 12:53:52 +08:00
AffectedArc07
16a37e2769
Standardises all files from CRLF to LF
2020-01-12 14:28:01 +00:00
Seris02
ac4489c6a8
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into tggenetics
2020-01-11 13:55:29 +08:00
BlackMajor
08d042901c
thank you github
2020-01-02 22:16:47 +13:00
BlackMajor
aabb39a364
Revert "Merge branch 'master' into Yeehaw"
...
This reverts commit 30e3edaac162c8fce043
2020-01-02 22:06:31 +13:00
BlackMajor
30e3edaac1
Merge branch 'master' into Yeehaw
2020-01-02 22:03:58 +13:00
BlackMajor
3239acf74d
Sync
2020-01-02 22:02:55 +13:00
Seris02
54f859fe06
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into tggenetics
2019-12-31 17:52:49 +08:00
kevinz000
310d343242
Merge pull request #10095 from Ghommie/Ghommie-cit443
...
Buffs clown ops by removing their clumsiness and adding a new trait to be used in place of several clown role checks.
2019-12-30 00:03:21 -08:00
BlackMajor
b811d3e57e
More work on it
2019-12-30 01:23:41 +13:00
Putnam
7947f06557
Made sure ghost cafe visitors don't get midround antags
2019-12-28 13:56:03 -08:00
Seris02
862acf2f06
ports hyper's genetics
2019-12-28 21:33:15 +08:00
Ghommie
88978209fa
Ports "Added TRAIT_DISK_VERIFIER, refactors how fake disk checks work slightly"
2019-12-19 16:42:25 +01:00
Ghommie
a82e0b9ee5
Buffs clown ops by removing their clumsiness and adding a new trait to be used in place of several clown role checks.
2019-12-07 09:45:38 +01:00
Ghommie
0a0094e80c
Fixes stuff I broke with my coding extravaganza.
2019-12-07 05:11:29 +01:00
Ghommie
65245dafed
Fixes ai displays status being reset to "Neutral" on login.
2019-11-29 04:07:56 +01:00
Lin
1ddb9935ff
Merge pull request #9530 from Ghommie/Ghommie-cit245
...
Touching up job outfits equip procs, little PDA fix.
2019-11-22 02:37:49 +00:00
Ghommie
c20bc123ab
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit336
2019-11-15 01:10:39 +01:00
kevinz000
178aedc5cc
Merge pull request #9754 from Ghommie/Ghommie-cit330
...
porting "global to static"
2019-11-14 16:38:27 -07:00
