Commit Graph

25102 Commits

Author SHA1 Message Date
Letter N
09283ca485 beans 2020-10-03 13:49:20 +08:00
Letter N
195dd5356b sig missing 2020-10-03 11:47:43 +08:00
Letter N
84a6624b03 Update cinematic.dm 2020-10-01 18:18:24 +08:00
Letter N
5418fb5b01 fixes minimaps and cinematic, also adds some dmdoc things 2020-10-01 17:36:56 +08:00
silicons
28ea9cc91c Merge pull request #13469 from Citadel-Station-13/revert-13436-worse-idea
Revert "C++ innovations: adds an "unstuck" step to SSair, AKA brute forcing LINDA"
2020-09-30 11:54:52 -07:00
silicons
9f3b456583 Merge pull request #13416 from BlueWildrose/slimenoises
Unique slimeperson screams and laughter, and adds new customizable speech verbs
2020-09-30 09:22:25 -07:00
Zandario
9104e2c041 Revert "C++ innovations: adds an "unstuck" step to SSair, AKA brute forcing LINDA" 2020-09-29 15:40:12 -05:00
Timothy Teakettle
783c33067b typo moment 2020-09-28 22:13:33 +01:00
silicons
7300ab26e3 Merge pull request #13439 from Tupinambis/polywantabugfix
Fixes a 5+ year old bug with ghost poly's hex value that potentially causes runtimes and crashes.
2020-09-27 00:37:06 -07: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
5b71d84486 Merge pull request #13436 from Putnam3145/worse-idea
C++ innovations: adds an "unstuck" step to SSair, AKA brute forcing LINDA
2020-09-27 00:34:50 -07:00
silicons
9fc169a3ae Merge pull request #13432 from SiliconMain/patch-6
Tweaks a thing
2020-09-27 00:33:14 -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
2b5a166425 Merge pull request #13421 from raspy-on-osu/teg-finale
alters the TEG's logistic power generation
2020-09-27 00:15:41 -07:00
silicons
e699f32a3b Merge pull request #13420 from thakyZ/lightreplacer-change
Light replacer can print at Engineering
2020-09-27 00:13:50 -07:00
silicons
c17929e889 Merge pull request #13419 from Degirin2120/09/22/20_engi_hazard_jumpsuits
Adds engineering hazard jumpsuits
2020-09-27 00:11:30 -07:00
silicons
c6d7bc886f Merge pull request #13414 from Putnam3145/its-2-seconds-yall
Fixed an erroneous comment that may cause issues.
2020-09-27 00:10:26 -07:00
silicons
f66c60884d Merge pull request #13413 from Putnam3145/fix-fuid-too-fast
Properly standardizes fuid production rate.
2020-09-27 00:10:12 -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
Tupinambis
cd5b108627 Alpha 2020-09-26 12:47:11 -05:00
Tupinambis
63c24e31b1 fixes a 5 year old hex value bug 2020-09-26 00:14:32 -05:00
timothyteakettle
04a7c66561 fix turret removal 2020-09-26 01:38:04 +01:00
Mark9013100
bbf5c7f43e Merge branch 'master' into 09/22/20_engi_hazard_jumpsuits 2020-09-25 15:45:38 -04:00
Mark9013100
e4f9849cc3 Adds engineering hazard jumpsuits 2020-09-25 15:40:38 -04:00
Putnam
24c48c2bec Adds an "unstuck" step to LINDA 2020-09-25 09:40:32 -07:00
SiliconMain
84f240c5dd Update holosign.dm 2020-09-25 09:50:08 -05:00
SiliconMain
4e5296438c Update tool_designs.dm 2020-09-25 09:46:11 -05:00
Putnam3145
f6d9d4b535 Merge pull request #13426 from CoreFlare/master
Gives IPCs hair.
2020-09-24 21:40:41 -07:00
Timothy Teakettle
106b8ccead Merge branch 'master' into heterochromia 2020-09-24 22:09:03 +01:00
Putnam
6f6e330984 Removes removeNullsFromList, cause it doesn't work. 2020-09-24 01:15:22 -07:00
silicons
7ca1b1dc79 Merge pull request #13380 from Putnam3145/cache-locality-experiments
(TESTMERGE THIS FIRST WOW) Made monstermos faster and more convenient
2020-09-23 14:39:56 -07:00
Putnam3145
c41add450a Merge pull request #13425 from Arturlang/TGUI_Updoot
Fixes some statpanel Issues
2020-09-23 14:19:22 -07:00
CoreFlare
1901677fdb finally. species_traits=list(HAIR) 2020-09-23 19:11:34 +01:00
Artur
e483cf06b3 fIXD 2020-09-23 19:54:30 +03:00
Artur
d493886875 Speedmerge fix 2020-09-23 19:14:50 +03:00
Putnam
e3e2cc7682 Actually properly unkludged it. 2020-09-23 06:41:03 -07:00
Putnam
1c99e59552 Makes cryo pods no longer replace already-won objectives. 2020-09-23 03:39:00 -07:00
Blue Wildrose
fe712d7e52 traviiiiiis 2020-09-22 20:14:14 -07:00
Blue Wildrose
e920e2855c travis please 2020-09-22 19:23:18 -07:00
Blue Wildrose
3e8572e5e2 Requested by Teak because they didn't want to make a PR for this 2020-09-22 19:10:24 -07:00
raspy-on-osu
87d65d5c58 init 2020-09-22 15:11:46 -04:00
Neko Boi Nick
6c8988c89c Light replacer can print at Engineering 2020-09-22 10:42:56 -07:00
Blue Wildrose
006a625504 Slimeperson screams and laughter! 2020-09-22 02:41:11 -07:00
Putnam
2e877b8c50 Hardcoded fusion scan results as "fusion" to fix a runtime.
It didn't need to be id anyway??
2020-09-22 00:23:13 -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
90aa47f339 Merge pull request #13329 from Arturlang/TGUI_Updoot
TGUI updates + statpanel
2020-09-21 03:11:06 -07:00
Artur
410550220b Fixed admin hide most verbs 2020-09-21 10:39:09 +03:00
silicons
8de3bcb08f Merge pull request #13402 from timothyteakettle/limbs
copying prefs always regenerates icons now (attempt to stop preview icons being outright wrong)
2020-09-20 21:30:08 -07:00