Commit Graph

25833 Commits

Author SHA1 Message Date
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
silicons 61bcb49dbf Merge pull request #13381 from Sonic121x/patch-2
fix pill button on chemical press
2020-09-11 14:13:34 -07:00
Timothy Teakettle 59a089d547 too weak 2020-09-11 22:09:51 +01:00
Blue Wildrose 81e9d34684 I love having my ears assaulted by 50 minesweeper_menuselect.oggs 2020-09-11 09:34:56 -07:00
Blue Wildrose 680872e08b 100% less band-aidy polyhood solution 2020-09-10 21:02:27 -07:00
Putnam 3ea7f0defa Added a gas mixture counter and fixed a segfault on exit. 2020-09-10 17:42:49 -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
silicons 9c58dbf2c5 Update killerqueen.dm 2020-09-10 12:00:17 -07:00
Timothy Teakettle 58737e42b9 empulse using range 2020-09-10 19:52:34 +01:00
silicons 700c129c21 Update walls.dm 2020-09-10 11:51:34 -07:00
Timothy Teakettle 348341ed80 Merge branch 'emp-rework' of https://github.com/timothyteakettle/Citadel-Station-13 into emp-rework 2020-09-10 19:17:19 +01:00
Timothy Teakettle b65fecca10 yay 2020-09-10 19:16:10 +01:00
Sonic121x bb734cc861 PillTypeAgain 2020-09-10 20:22:17 +08:00
Putnam 373f6a1068 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into cache-locality-experiments 2020-09-10 04:57:43 -07:00
Putnam fb17f0cc75 Somehow made monstermos over 100x as fast 2020-09-10 04:48:55 -07: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
Putnam c824818ec7 Makes antag injection less probabilistic. 2020-09-09 20:49:26 -07:00
timothyteakettle d2f4d675a4 fuck 2020-09-10 03:55:24 +01:00
timothyteakettle 6da8690bc6 woops 2020-09-10 03:50:41 +01:00
timothyteakettle e0f44ef717 new emps 2020-09-10 03:49:47 +01:00
Blue Wildrose 1b77e69fb4 Slimepeople diet changes 2020-09-09 18:11:25 -07:00
Blue Wildrose f634a31bfb Update polychromic.dm 2020-09-09 15:28:45 -07:00
Timothy Teakettle f1cd94fc97 emp rework 2020-09-09 23:14:06 +01:00
Artur 12fbd67b6d Stupid shit 2020-09-09 21:27:32 +03:00
Artur ff4c94c2d5 Fixes some verbs and gateway 2020-09-09 21:08:16 +03:00
silicons 4f4b849b23 Update killerqueen.dm 2020-09-08 20:52:28 -07:00
silicons 2fdcfa4f07 Update killerqueen.dm 2020-09-08 20:50:06 -07:00
DeltaFire c056c8ac91 boom boom 2020-09-08 20:49:24 +02:00
silicons a668251de6 Merge pull request #13353 from timothyteakettle/accent-tidyup
further accent modifications because holy shit
2020-09-08 10:31:45 -07:00
Artur b2fb23f4b9 Alt click fix 2020-09-08 17:56:05 +03:00
silicons 809d6b212c Merge pull request #13344 from Putnam3145/fix-monstermos-superconduct
Makes heat conduction work for the first time ever
2020-09-08 01:58:19 -07:00
Artur 21139001a7 Merge remote-tracking branch 'origin/TGUI_Updoot' into TGUI_Updoot 2020-09-08 11:40:52 +03:00
Artur 58a27fd5ef Makes it start first 2020-09-08 11:09:39 +03:00
zeroisthebiggay 9acc436063 a
a
2020-09-08 03:55:44 -04:00
zerothebigboy 6977d7a73b i hate making this 2020-09-08 03:42:58 -04:00
Tupinambis fe7a21ebc7 Coggers Fixes + Mass Driver Things 2020-09-07 22:33:54 -05:00
BlackMajor 3ce2661cfc Merge pull request #13354 from Citadel-Station-13/silicons-patch-33
meteors are a static 5 minute instead of random 3-6 minutes
2020-09-08 12:05:51 +12:00
BlackMajor ac346a7cc9 Merge pull request #13350 from Citadel-Station-13/silicons-patch-32
fixes reagent containers doubleattacking
2020-09-08 12:05:29 +12:00
BlackMajor 1f96766699 Merge pull request #13273 from Citadel-Station-13/silicons-patch-2
slightly more intuitive eyebeam clamping
2020-09-08 12:05:10 +12:00
silicons 419eb5ae05 Merge pull request #13360 from KeRSedChaplain/silicon_death_sounds
Silicon death sounds or "Cease shooting the malfunctioning metal doorknob at the tone"
2020-09-07 13:42:31 -07:00
silicons 07b28f40de Merge pull request #13359 from Ghommie/Ghommie-cit838
Turf visuals fix plus corrected names of a couple things.
2020-09-07 13:42:05 -07:00