Commit Graph

26370 Commits

Author SHA1 Message Date
silicons 4f4c6b85bf Merge pull request #12720 from timothyteakettle/eye-contact
port examines and eye contact
2020-07-11 00:14:47 -07:00
The0bserver db625eb93f Initial Commit: Adds slimeball recipe 2020-07-10 23:04:25 -04:00
timothyteakettle e571400b1b lots of bug fixes 2020-07-11 03:35:15 +01:00
Timothy Teakettle 75b9eef74e bug fixes 2020-07-10 22:52:08 +01:00
Timothy Teakettle 045169e1ee actual trader subtypes 2020-07-10 22:50:22 +01:00
Timothy Teakettle 60b9e9dafe trader event/mob 2020-07-10 21:06:53 +01:00
Lin 49ae116bac Merge pull request #12705 from Citadel-Station-13/silicons-patch-16
fixes sdql2 array operator not properly nesting lists
2020-07-10 14:56:31 -05:00
Lin 6fb729d69c Merge pull request #12718 from Citadel-Station-13/silicons-patch-17
Fixes revenants for real because they're just that much shitcode
2020-07-10 14:55:51 -05:00
Artur 0867f92c4a Fixes APC Interface locks 2020-07-10 19:52:49 +03:00
silicons 630d65dfec done 2020-07-10 00:08:53 -07:00
silicons 214b95445e status panel 2020-07-09 23:59:51 -07:00
silicons dc1de02b74 Update human_movement.dm 2020-07-09 23:44:17 -07:00
Chiirno 2940f0efa5 Update code/game/objects/items/storage/firstaid.dm
Co-authored-by: silicons <2003111+silicons@users.noreply.github.com>
2020-07-10 02:35:42 -04:00
silicons 9c9c611285 ok 2020-07-09 23:34:35 -07:00
silicons 8686029009 Update turnstile.dm 2020-07-09 23:04:58 -07:00
silicons 6af7519727 Update turnstile.dm 2020-07-09 23:04:06 -07:00
YakumoChen 475a546033 adds wedding crate 2020-07-10 04:06:55 +00:00
silicons 9d6003b920 ok 2020-07-09 21:06:03 -07:00
silicons 31da81aff4 Merge pull request #12217 from Putnam3145/putnamos-for-real
The real fastmos: C++ monstermos port
2020-07-09 20:37:18 -07:00
kappa-sama a798061f71 also this 2020-07-09 16:14:38 -05:00
kappa-sama af106b7628 10 2020-07-09 16:12:07 -05:00
Keate Senior 7422e86c1b fucking forgot the defines 2020-07-09 16:41:23 -04:00
Keate Senior 928a7a956f Adds things to help the cult become station based
Adds (or re-adds I guess) the old spells and stuctures from parts based clock cult, soon to be meant for construction/power generation as well as possible QoL things
2020-07-09 16:30:52 -04:00
Artur 84a22a9f49 Fixes cloning species transfer 2020-07-09 23:06:57 +03:00
Artur 9de8483bcf Merge remote-tracking branch 'Upstream/master' into TGUI-3.0 2020-07-09 22:14:20 +03:00
Timothy Teakettle 02f46322ad port examine 2020-07-09 18:32:45 +01:00
Putnam 9b955e5d03 gotta replace all of them actually 2020-07-09 03:19:52 -07:00
silicons 26d384e65b fix 2020-07-09 03:17:17 -07:00
silicons 93e0ceded7 Update canister.dm 2020-07-09 03:01:56 -07:00
silicons bf4936cb02 Merge pull request #12707 from Chiirno/slimebrain
Resprited brains into a new slime core sprite for jelly people.
2020-07-09 02:26:27 -07:00
silicons aae496492f Update revenant.dm 2020-07-09 02:22:30 -07:00
Putnam 7cf4a55496 at least it'll fail better this time 2020-07-09 02:18:08 -07:00
Putnam 196261296e probably fixes travis 2020-07-09 01:40:39 -07:00
Putnam aefdf9eef7 duplicate REVERSE_DIR 2020-07-09 01:38:17 -07:00
Putnam 2a04ab19fd windoors :b:roke 2020-07-09 01:36:57 -07:00
YakumoChen bfa672b091 adds some rings to the wedding crate 2020-07-09 07:49:11 +00:00
YakumoChen 1a82955f32 adds a wedding crate 2020-07-09 07:22:33 +00:00
Letter N eeedad21de ^w^ 2020-07-09 14:32:23 +08:00
Putnam 75c0b01c86 Updated to july 2020. 2020-07-08 23:13:26 -07:00
silicons 1b97c9954f Merge pull request #12712 from TheObserver-sys/Imadeanoops
Hey, what if you could actually make the donuts?
2020-07-08 22:54:53 -07:00
silicons be49be022b Merge pull request #12710 from Sneakyrat6/hoodieFix
Fixes hair falling out of hoodies
2020-07-08 22:52:20 -07:00
silicons 9828d6fe85 Merge pull request #12700 from KeRSedChaplain/POSTRATVAR
Post This Ratvar, OR how I regained my contributor role in one simple step, OR how I buffed clock cult unknowingly.
2020-07-08 22:51:36 -07:00
Putnam a625d6562b Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into putnamos-for-real 2020-07-08 22:02:03 -07:00
HeroWithYay bed6f4ac91 Adds "Telecrystal Dust" a useless, red waste of syndicate resources that can be obtained by grinding raw telecrystals in a blender.
Also makes it so you can sell raw telecrystals at cargo 1000 points each which is also a considerable waste of TC.
2020-07-09 16:32:14 +12:00
DeltaFire 7aa160029f changes sent's healing a bit
No more killing augmented followers, it heals them aswell. Ratvar is a machine god afterall.
2020-07-08 23:45:35 +02:00
Artur e12d690d3f hopefulyl fixes cloning!?!? 2020-07-08 23:54:00 +03:00
Artur 0a9dc33ce1 Reverts cloning changes 2020-07-08 23:42:47 +03:00
Artur e3ba2e60c6 Not supported 2020-07-08 20:31:08 +03:00
silicons 6d1ca993f6 Merge pull request #12648 from timothyteakettle/tray-and-jar
bluespace tray + bluespace jar
2020-07-08 03:10:44 -07:00
Letter N 2d447019c5 woops 2020-07-08 16:59:22 +08:00