Commit Graph

19184 Commits

Author SHA1 Message Date
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
dc1de02b74 Update human_movement.dm 2020-07-09 23:44:17 -07:00
silicons
9c9c611285 ok 2020-07-09 23:34:35 -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
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
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
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
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
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
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
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
Letter N
05684e7196 no config filter thing yet, but the code for it is "ready" 2020-07-08 16:36:58 +08:00
Letter N
f757e54db9 muh immursion 2020-07-08 15:59:44 +08:00
Letter N
45a3c47608 removes fun 2020-07-08 15:10:49 +08:00
silicons
6cbab55ef8 Merge remote-tracking branch 'citadel/master' into unarmed_parry 2020-07-07 21:07:58 -07:00
silicons
22c3d9fe3e ok 2020-07-07 21:07:13 -07:00
silicons
bd8cc4791f whew 2020-07-07 21:02:23 -07:00
silicons
6ee63f66aa whew 2020-07-07 20:48:54 -07:00
Sneakyrat6
3569e8da1e Fixes hair falling out of hoodies 2020-07-07 22:31:00 -05:00
Trilbyspaceclone
062d514ac2 Update legion.dm 2020-07-07 14:30:09 -04:00
Trilbyspaceclone
b2dd2a1053 Update necropolis_chests.dm 2020-07-07 14:28:40 -04:00
Trilbyspaceclone
023dcc0019 Update spellcard.dm 2020-07-07 14:22:41 -04:00
Trilbyspaceclone
ddeb564c80 Legion fix 2020-07-07 14:21:16 -04:00
Trilbyspaceclone
f479a8622e Update spell_book.dm 2020-07-07 14:11:46 -04:00
Trilbyspaceclone
c21011c64c Update spellcard.dm 2020-07-07 14:09:31 -04:00
Trilbyspaceclone
f7dbce0cd0 Update spellcard.dm 2020-07-07 13:55:02 -04:00
Trilbyspaceclone
dae3110100 Update wand.dm 2020-07-07 13:52:41 -04:00
Trilbyspaceclone
8aceeb0c43 Update spell_book.dm 2020-07-07 13:50:42 -04:00
Trilbyspaceclone
49b0d38112 Apply suggestions from code review
Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>
2020-07-07 13:47:56 -04:00