Detective Google
57132d0b32
Merge remote-tracking branch 'upstream/master' into clothing
2020-10-01 14:06:21 -05:00
Detective Google
98703e6ad6
Merge remote-tracking branch 'upstream/master' into arcade-carpets
2020-10-01 13:41:10 -05:00
Timothy Teakettle
e1123ad7fe
color define
2020-10-01 18:55:32 +01:00
DeltaFire
e012b8f082
typo
2020-10-01 17:18:28 +02:00
DeltaFire
d54a899695
fixes KA modkits being installed in borgs by others
...
These have been broken for so long holy fuck
2020-10-01 17:13:03 +02:00
silicons and GitHub
c8d6f3d22a
Merge pull request #13477 from LetterN/patch-2
...
Adds craftable railings
2020-10-01 03:13:51 -07:00
silicons and GitHub
d8e58b1c48
Merge pull request #13452 from Tupinambis/CarbonHydrogenBromine
...
Ascent Port Project: Methane and Methyl Bromide Gas Additions
2020-10-01 03:13:15 -07:00
silicons and GitHub
4dd9f20d22
Merge pull request #13470 from EmeraldSundisk/skelter
...
Helter-Skelter.
2020-10-01 03:09:51 -07:00
silicons and GitHub
38c25bdc9d
Merge pull request #13466 from Putnam3145/sdgf-fix
...
Cleans up and fixes SDGF code a bit, consistent naked clones, transfer_ckey resets view range
2020-10-01 03:07:08 -07:00
silicons and GitHub
7553508a2a
Merge pull request #13455 from Putnam3145/pyroclastic-policy
...
Added policy config for sentient pyro slimes (no actual policy yet)
2020-10-01 03:06:03 -07:00
silicons and GitHub
a9ad06c107
Merge pull request #13446 from Putnam3145/dynamic-why-prob
...
Makes dynamic less probabilistic, keeping the desired threat level more aggressively
2020-10-01 03:05:15 -07:00
silicons and GitHub
47aef0d574
Merge pull request #13443 from ItzGabby/gabby-wooden-floors
...
Gabbys new wooden floor tile types
2020-10-01 03:04:21 -07:00
silicons and GitHub
8b36cf6f64
Merge pull request #13375 from timothyteakettle/emp-rework
...
the emp rework (emp severity reduces as you move from epicentre, severity is 1-100)
2020-10-01 03:01:18 -07:00
Ghom and GitHub
dd43594e5b
Merge pull request #13417 from Citadel-Station-13/silicons-patch-1
...
fixes mecha trackers
2020-10-01 11:40:24 +02:00
Letter N
c7875f2792
commit 3
2020-10-01 12:54:49 +08:00
Letter N and GitHub
d9ab31e199
commit 2
2020-10-01 11:30:01 +08:00
Detective Google
c4480afc09
Adds a bunch of RP clothes and ports the detvendor
2020-09-30 20:50:00 -05:00
Tupinambis
0bb889932d
Completed!
2020-09-30 19:05:56 -05:00
Tupinambis
113b84ab50
Ports arachnids from WaspStation
2020-09-30 15:10:17 -05:00
timothyteakettle
ccb774b8f2
puddles
2020-09-30 02:15:34 +01:00
EmeraldSundisk
a41963fa13
Update space.dm
2020-09-29 13:03:11 -07:00
EmeraldSundisk
41d263da84
Update space.dm
2020-09-29 12:43:40 -07:00
Putnam
8a01b949bf
Cleaned up SDGF and consistencised clones.
2020-09-29 03:47:09 -07:00
EmeraldSundisk
633da981e2
Update space.dm
2020-09-28 23:01:31 -07:00
EmeraldSundisk
0f88f93f59
4now
2020-09-28 22:51:59 -07:00
Detective Google
643421bc23
adds arcade carpets
...
yay
2020-09-28 14:43:03 -05:00
Tupinambis
f552459f4a
13->14 distro
2020-09-27 17:28:50 -05:00
Putnam
4252ef606d
Added policy config for sentient pyro slimes (no actual policy)
2020-09-27 15:28:24 -07:00
Tupinambis
d2500fe389
Adds Methane and Methyl Bromide
2020-09-27 15:15:58 -05:00
silicons and GitHub
4d82c219f5
Merge pull request #13437 from timothyteakettle/turret-fix
...
turrets will now break instead of magically poofing out of existence
2020-09-27 00:35:06 -07:00
silicons and GitHub
987cfc7582
Merge pull request #13424 from Putnam3145/fix-cryo-objective-bull
...
Makes cryo pods no longer replace already-won objectives.
2020-09-27 00:16:45 -07:00
silicons and GitHub
e602284bcb
Merge pull request #13412 from Putnam3145/supermatter-bad
...
Removed the supermatter sabotage objective; reworked non-murder MI13 objective picking.
2020-09-27 00:09:56 -07:00
silicons and GitHub
1092eacc6e
Merge pull request #13397 from ArchieBeepBoop/microfans
...
Micro Powered Fans!
2020-09-27 00:03:43 -07:00
silicons and GitHub
00ab73d0a3
Merge pull request #13286 from timothyteakettle/heterochromia
...
heterochromia: you can select individual eye colours
2020-09-27 00:01:00 -07:00
Putnam
61abfb6720
cargo cult math smh
2020-09-26 22:04:20 -07:00
Putnam
37dfbf8f33
Updated the readme a bit.
2020-09-26 21:52:16 -07:00
ItzGabby
b97b595f6f
Three new wooden floor types
2020-09-26 18:29:46 -04:00
timothyteakettle
04a7c66561
fix turret removal
2020-09-26 01:38:04 +01:00
DeltaFire
178be2b643
fixes plushlings
...
This makes it so the snowflake id is actually set if the plush is a snowflake, and also makes plushlings not become invisible anymore if they absorb a snowflake plush
2020-09-25 23:41:18 +02:00
DeltaFire
07f50845b6
no more conditional invincibility
2020-09-25 23:24:00 +02:00
SiliconMain and GitHub
84f240c5dd
Update holosign.dm
2020-09-25 09:50:08 -05:00
silicons
57c4a3416a
Merge remote-tracking branch 'citadel/master' into combat_rework_experimental
2020-09-25 01:03:15 -07:00
Timothy Teakettle and GitHub
106b8ccead
Merge branch 'master' into heterochromia
2020-09-24 22:09:03 +01:00
Putnam
1c99e59552
Makes cryo pods no longer replace already-won objectives.
2020-09-23 03:39:00 -07:00
silicons and GitHub
5e355dafe8
Update mecha_defense.dm
2020-09-22 04:39:43 -07:00
silicons and GitHub
60a299197b
Update mecha_defense.dm
2020-09-22 04:38:47 -07:00
silicons
9a17c42321
sigh
2020-09-22 01:53:16 -07:00
Putnam
e89e7adda4
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into cache-locality-experiments
2020-09-21 03:31:35 -07:00
silicons
9fef16964c
Merge remote-tracking branch 'citadel/master' into combat_rework_experimental
2020-09-21 03:13:51 -07:00
Artur
435565f1d8
Merge remote-tracking branch 'origin/master' into TGUI_Updoot
2020-09-21 00:16:12 +03:00