Commit Graph

25079 Commits

Author SHA1 Message Date
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
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
SiliconMain
84f240c5dd Update holosign.dm 2020-09-25 09:50:08 -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
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
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
silicons
26eebf3b32 Merge pull request #13408 from YakumoChen/dont-be-a-dick-shinji
Get in the damn robot, Skylar
2020-09-20 21:24:08 -07:00
Artur
435565f1d8 Merge remote-tracking branch 'origin/master' into TGUI_Updoot 2020-09-21 00:16:12 +03:00
Putnam
39ac36c073 Changed an inaccurate comment. 2020-09-20 00:09:45 -07:00
Putnam
63b0d61c5b Reworked the selection to scale automatically with objective counts. 2020-09-19 23:35:04 -07:00
Putnam
556a69ac78 Removed the supermatter objective; made sabotage objectives less common. 2020-09-19 22:45:32 -07:00
Putnam
666965c7b7 Made fuid generate 1/10 as fast. 2020-09-19 22:40:44 -07:00
Dip
a3bf4ac580 Fixes requested 2020-09-19 13:02:08 -03:00
Ghom
b29143ea03 Merge pull request #13364 from Citadel-Station-13/silicons-patch-34
projectile process invoke async because people keep breaking shit and trying to enforce do not sleep on it is a moot point because people keep breaking shit
2020-09-19 16:53:55 +02: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
Putnam3145
ccbacfb0bf Merge pull request #13403 from Citadel-Station-13/silicons-patch-38
fixes joystick users getting kicked for hacking. again.
2020-09-19 06:05:25 -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
Putnam3145
e52ba8d883 Merge pull request #13406 from Citadel-Station-13/silicons-patch-39
fixes airlock wire runtimes from non-user wire damage
2020-09-19 06:04:31 -07:00
silicons
54f48c3754 Merge pull request #13394 from DeltaFire15/attack-runtime-fixes
Some bodypart-related fixes
2020-09-19 06:02:32 -07:00
YakumoChen
85f8c22da9 adds mech suits to robodrobe 2020-09-18 21:16:25 +00:00
YakumoChen
9c7b43a83b mech suits 2020-09-18 21:13:08 +00:00
silicons
b9315c5080 Update airlock.dm 2020-09-18 04:26:22 -07:00
silicons
59372710bb Update keybindings.dm 2020-09-17 21:41:05 -07:00
silicons
3629addf0f Update ticketmachine.dm 2020-09-17 04:37:10 -07:00
silicons
872ef07b43 Update brawn.dm 2020-09-17 04:36:39 -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