Commit Graph

8825 Commits

Author SHA1 Message Date
silicons
c8d6f3d22a Merge pull request #13477 from LetterN/patch-2
Adds craftable railings
2020-10-01 03:13:51 -07:00
silicons
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
4dd9f20d22 Merge pull request #13470 from EmeraldSundisk/skelter
Helter-Skelter.
2020-10-01 03:09:51 -07:00
silicons
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
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
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
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
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
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
d9ab31e199 commit 2 2020-10-01 11:30:01 +08: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
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
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
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
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
1092eacc6e Merge pull request #13397 from ArchieBeepBoop/microfans
Micro Powered Fans!
2020-09-27 00:03:43 -07:00
silicons
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
SiliconMain
84f240c5dd Update holosign.dm 2020-09-25 09:50:08 -05:00
Timothy Teakettle
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
5e355dafe8 Update mecha_defense.dm 2020-09-22 04:39:43 -07:00
silicons
60a299197b Update mecha_defense.dm 2020-09-22 04:38:47 -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
Artur
435565f1d8 Merge remote-tracking branch 'origin/master' into TGUI_Updoot 2020-09-21 00:16:12 +03:00
Putnam
556a69ac78 Removed the supermatter objective; made sabotage objectives less common. 2020-09-19 22:45:32 -07:00
Dip
a3bf4ac580 Fixes requested 2020-09-19 13:02:08 -03:00
Putnam3145
62228905da Merge pull request #13382 from Citadel-Station-13/silicons-patch-36
hulks no longer break their hand from punching a wall
2020-09-19 06:07:04 -07:00
Putnam3145
9c305d1db6 Merge pull request #13400 from silicons/shields
adds two procs to find exterior tiles for projecting hull shields around for later pr
2020-09-19 06:06:46 -07:00
Ghom
868e464b40 fixes linter issues, removes acid degrading armor (#13399)
* fix

* more

* Update brawn.dm

* Update ticketmachine.dm
2020-09-19 15:04:48 +02:00
silicons
54f48c3754 Merge pull request #13394 from DeltaFire15/attack-runtime-fixes
Some bodypart-related fixes
2020-09-19 06:02:32 -07:00
Dip
fa516fc517 Set atmos pass to yes on assembly 2020-09-16 20:51:40 -03:00
Dip
8d33b3a8da convert to machinery type 2020-09-16 20:28:31 -03:00
Dip
2e9265937d duplicate fan bugfix 2020-09-16 20:01:37 -03:00
Dip
7e00d81758 Microfan Rework 2020-09-16 19:28:59 -03:00
silicons
ca8b13b86a Merge pull request #13255 from timothyteakettle/limbs
you can choose limbs to be prosthetic/amputated
2020-09-16 00:31:18 -07:00
silicons
17b21d29f3 helpers 2020-09-16 00:07:33 -07:00
silicons
95ebeac5b6 fix 2020-09-15 17:27:11 -07:00
Dip
394d383746 Clone Microfans 2020-09-15 19:27:58 -03:00
DeltaFire
f892309903 fixes 2020-09-15 17:35:58 +02:00