Commit Graph

16691 Commits

Author SHA1 Message Date
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
EmeraldSundisk 7c5de6996b cargotech wardrobe 2020-09-19 15:41:59 -07:00
EmeraldSundisk 8ced447303 cargo tech code 2020-09-19 15:29:27 -07: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 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
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 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
silicons 49333833a4 debugging done 2020-09-16 00:44:57 -07: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 39d3a4f596 Merge pull request #13362 from Putnam3145/fix-fuid-production
Fixes organ fluid production.
2020-09-15 17:30:46 -07:00
silicons 97c27b30f5 Merge pull request #13365 from DeltaFire15/tendril-stuff-fixes
Hey wait isn't there numbers between 11 and 15
2020-09-15 17:30:06 -07:00
silicons cffc321050 more 2020-09-15 17:27:50 -07:00
silicons 95ebeac5b6 fix 2020-09-15 17:27:11 -07:00
timothyteakettle c3bea5f77b wounds 2020-09-15 23:50:26 +01:00
timothyteakettle 7be15afb32 config 2020-09-15 23:20:11 +01:00
Artur 1c831692a7 Properly fixed altclick 2020-09-16 00:41:47 +03:00
Timothy Teakettle e67fbed1ba always regenerate icons 2020-09-15 18:37:14 +01:00
DeltaFire f892309903 fixes 2020-09-15 17:35:58 +02:00
Putnam b06f19cf5c Brought reactions to extools again; now including debug symbols.
This time they work!
2020-09-14 19:32:31 -07:00
Timothy Teakettle 744792742b please fix it 2020-09-12 22:32:06 +01:00
DeltaFire 9e3710bb51 kev request
malf disk gone from the /misc chest type
2020-09-11 23:19:55 +02:00
silicons ad128c292e Merge pull request #13351 from Trilbyspaceclone/patch-402
Correrts open loop on race drinks
2020-09-11 14:16:33 -07:00
silicons 5f2f524065 Merge pull request #13355 from lolman360/AnPrimAssistants
fixes glaives
2020-09-11 14:16:22 -07:00
silicons 18d949e674 Merge pull request #13357 from TheObserver-sys/BrassDatumDirectToYou
Brass Material Datum: "Sbetr Jryy!"
2020-09-11 14:15:54 -07:00
silicons 563b21d8fa Merge pull request #13363 from Putnam3145/bloodsucker-ling-life-code
Signalizes ling/bloodsucker life code.
2020-09-11 14:15:37 -07:00
silicons 30358d9619 Merge pull request #13369 from zeroisthebiggay/godthisisawful
the PR I really didn't want to make - poplocks revolvers to 15 people
2020-09-11 14:14:43 -07:00
silicons 1453911ca0 Merge pull request #13370 from DeltaFire15/gamer-AI-moment
[s] Lets not have certain irreplacable things get qdel()d by one simple trick
2020-09-11 14:14:32 -07:00
silicons 89f246db39 Merge pull request #13373 from BlueWildrose/why_my_hood_no_color
Fixed toggleable polychromic hoods/helmets not polychroming with their suit
2020-09-11 14:14:16 -07:00
silicons 173ac3ebed Merge pull request #13374 from BlueWildrose/slimepersondiets
Slimepeople diet preference changes
2020-09-11 14:14:06 -07:00
silicons 72d99561dd Merge pull request #13377 from Putnam3145/more_tests
Adds some unit tests for reactions.
2020-09-11 14:13:56 -07:00
Blue Wildrose 680872e08b 100% less band-aidy polyhood solution 2020-09-10 21:02:27 -07:00
Timothy Teakettle 4bad1d23cb Update human_defense.dm 2020-09-10 23:22:34 +01:00
Timothy Teakettle 3d2206935c Update human_defense.dm 2020-09-10 23:22:29 +01:00
Timothy Teakettle cb36f4ad24 travis we're friends right 2020-09-10 22:50:17 +01:00
Timothy Teakettle 58737e42b9 empulse using range 2020-09-10 19:52:34 +01:00
Sonic121x bb734cc861 PillTypeAgain 2020-09-10 20:22:17 +08:00
Blue Wildrose 13230d502e oops I fucked up 2020-09-09 22:36:11 -07:00
Putnam b8c0c77b71 Makes atmos not get stuck at very cold 2020-09-09 22:24:54 -07:00
Putnam 697723c027 Adds some unit tests for reactions. 2020-09-09 22:23:31 -07:00
Blue Wildrose 7f028899fa Forgot valid salid - also included ambrosia deus, white cannabis, and lime fruit 2020-09-09 22:18:17 -07:00