cyberpresidentvanellope/S.P.L.U.R.T-Station-13
1
0
Fork 0
mirror of https://github.com/SPLURT-Station/S.P.L.U.R.T-Station-13.git synced 2025-12-14 20:02:43 +00:00
Code Issues Packages Projects Releases Wiki Activity
35,341 Commits 55 Branches 0 Tags
147a905b5d4f6bbb51aeb51e6b45f7a58dd9a44f
Commit Graph

23192 Commits

Author SHA1 Message Date
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
silicons
dc1de02b74 Update human_movement.dm 2020-07-09 23:44:17 -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
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
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
Sneakyrat6
fa8ea6c430 Merge remote-tracking branch 'upstream/master' into hoodieFix 2020-07-07 23:48:59 -05:00
silicons
22c3d9fe3e ok 2020-07-07 21:07:13 -07:00
Sneakyrat6
3569e8da1e Fixes hair falling out of hoodies 2020-07-07 22:31:00 -05:00
Timothy Teakettle
f0935a784d two missing traits woops 2020-07-07 23:24:25 +01:00
Timothy Teakettle
e07909ebe2 does it in a far superior way 2020-07-07 23:12:36 +01:00
Lin
33f56fd168 Merge pull request #12694 from Ghommie/Ghommie-cit833 
mowing down experimental cloner copypasta.
 2020-07-07 13:23:25 -05:00
Cirno
37f4022bfc Changed slime core to slime nucleus 2020-07-07 13:35:30 -03:00
Cirno
fe45971e43 Added a slime core in the place of brains for jelly people 2020-07-07 12:05:06 -03:00
silicons
6634e43be4 fix 2020-07-07 07:41:33 -07:00
silicons
cee15792b7 ok 2020-07-07 07:25:10 -07:00
silicons
9910867345 Update SDQL_2.dm 2020-07-07 06:19:17 -07:00
timothyteakettle
ab5795b3d3 Update pet_carrier.dm 2020-07-07 03:03:09 +01:00
silicons
5b09b68c6d Merge pull request #12702 from DeltaFire15/actually-kill-once 
[s] Fixes the 'Kill once' objective
 2020-07-06 17:38:24 -07:00
silicons
0c0bf46f7f Merge pull request #12696 from Chiirno/emichemmastertweak 
increased the amount of stuff the chem master can dispense from 10 to 20
 2020-07-06 17:34:50 -07:00
silicons
4fa7a461ef Merge pull request #12684 from Owai-Seek/foodport-p1-7/1/20 
Food ports, tweaks, and fixes.
 2020-07-06 17:19:07 -07:00
Ghom
c2746c723e Merge pull request #12698 from Owai-Seek/beebalmfix-7-4-20 
Fixes Bee Balm
 2020-07-07 00:22:33 +02:00