2e9265937d
duplicate fan bugfix
2020-09-16 20:01:37 -03:00
7e00d81758
Microfan Rework
2020-09-16 19:28:59 -03:00
ca8b13b86a
Merge pull request #13255 from timothyteakettle/limbs
...
you can choose limbs to be prosthetic/amputated
2020-09-16 00:31:18 -07:00
17b21d29f3
helpers
2020-09-16 00:07:33 -07:00
12bf3aebda
Merge remote-tracking branch 'upstream/master' into cool-ipcs
2020-09-16 05:12:20 +01:00
125b50d392
Merge branch 'master' into cool-ipcs
2020-09-16 05:09:02 +01:00
95ebeac5b6
fix
2020-09-15 17:27:11 -07:00
e7220e842e
things
2020-09-15 15:29:34 -07:00
394d383746
Clone Microfans
2020-09-15 19:27:58 -03:00
f892309903
fixes
2020-09-15 17:35:58 +02:00
f13af9f72e
Made gases only display in analyzers if they have at least 0.005 moles.
2020-09-14 02:37:47 -07:00
bd183e8e28
removes an unneeded check
2020-09-13 13:27:57 +02:00
8975b93b37
no petting and not petting at the same time
2020-09-13 03:43:31 +02:00
2d8655d712
plushie shapeshifter
2020-09-13 03:25:43 +02:00
fab1523c15
nevermind
2020-09-12 01:01:36 +01:00
18d949e674
Merge pull request #13357 from TheObserver-sys/BrassDatumDirectToYou
...
Brass Material Datum: "Sbetr Jryy!"
2020-09-11 14:15:54 -07:00
10a753bf4d
Merge pull request #13368 from Tupinambis/CoggyDoggy
...
Cogstation Fixes and Improvements
2020-09-11 14:14:59 -07:00
59a089d547
too weak
2020-09-11 22:09:51 +01:00
81e9d34684
I love having my ears assaulted by 50 minesweeper_menuselect.oggs
2020-09-11 09:34:56 -07:00
3ea7f0defa
Added a gas mixture counter and fixed a segfault on exit.
2020-09-10 17:42:49 -07:00
58737e42b9
empulse using range
2020-09-10 19:52:34 +01:00
700c129c21
Update walls.dm
2020-09-10 11:51:34 -07:00
348341ed80
Merge branch 'emp-rework' of https://github.com/timothyteakettle/Citadel-Station-13 into emp-rework
2020-09-10 19:17:19 +01:00
b65fecca10
yay
2020-09-10 19:16:10 +01:00
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
fb17f0cc75
Somehow made monstermos over 100x as fast
2020-09-10 04:48:55 -07:00
c824818ec7
Makes antag injection less probabilistic.
2020-09-09 20:49:26 -07:00
d2f4d675a4
fuck
2020-09-10 03:55:24 +01:00
6da8690bc6
woops
2020-09-10 03:50:41 +01:00
e0f44ef717
new emps
2020-09-10 03:49:47 +01:00
f1cd94fc97
emp rework
2020-09-09 23:14:06 +01:00
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
fe7a21ebc7
Coggers Fixes + Mass Driver Things
2020-09-07 22:33:54 -05:00
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
45ee1cbbf8
Merge pull request #13334 from CameronWoof/revert-12739-DRAKEBORG
...
Revert Drakeborgs
2020-09-06 15:22:16 -07:00
f8c1c829d7
maulers slam people very violently
2020-09-06 15:34:53 -05:00
4a04b22b72
Turf visuals fix plus corrected names of a couple things.
2020-09-06 18:53:01 +02:00
9e204f167f
Merge pull request #12452 from Trilbyspaceclone/spike-loot-differentces
...
Miner Loot Shuffle MK III
2020-09-06 01:58:46 -07:00
63b1bfd45c
Merge pull request #13303 from Citadel-Station-13/silicons-patch-27
...
combat defibs now hit for disarm + 35 stamina (old stunbaton values) instead of disarm + 75 stamina
2020-09-06 18:03:59 +12:00
f12a9ccefb
Merge pull request #13301 from Citadel-Station-13/silicons-patch-26
...
on someone's request i am making meteors slice through station ruins like butter so they are no longer free meteor shields because i want to make meteor timer 10 minutes instead of 4
2020-09-06 18:03:05 +12:00
1943a2fdd7
Merge pull request #13246 from silicons/anomaly_manufacturing
...
anomaly manufacturing port from tg. supermatter anomaly generation nerfed to 20% rather than removed
2020-09-06 17:53:35 +12:00
3eafab209d
Merge pull request #13136 from Citadel-Station-13/silicons-patch-8
...
the station charter rename now disallows any name with characters above a single byte in length unless an admin edits it to allow unicode
2020-09-06 17:50:32 +12:00
cddd46fce3
Maybe this will work. Maybe it won't.
2020-09-05 18:52:20 -04:00
6e6ca622e6
Merge pull request #13279 from Hatterhat/the-desword-block-buff
...
alternate to 13728 - 60% rngblock, activeblock covers sides, effectiveness against projectiles upped
2020-09-05 13:10:50 -07:00
7b50b22c7b
Merge pull request #13244 from lolman360/AnPrimAssistants
...
Blacksmithing 2: Anarcho-Primitivist Assistants (travis don't fail on me now)
2020-09-05 02:20:11 -07:00
6527e2e9ea
Merge pull request #13348 from raspy-on-osu/thermomachine-why
...
Thermomachine boards (Freezer/Heater) now tell you how to change their pipe layer
2020-09-05 02:16:18 -07:00
a58a67f90c
Merge pull request #13339 from Putnam3145/dynamic-event-decouples
...
Completely decouples events from dynamic.
2020-09-05 02:12:00 -07:00
4c8983f006
init
2020-09-04 22:13:56 -04:00
288104a22b
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into fix-monstermos-superconduct
2020-09-04 17:26:40 -07:00
14ebeddea2
Merge pull request #13304 from GrayRachnid/revert-8235-defib-notouch
...
Revert "Buffs defib users by making them stop pulling automatically"
2020-09-04 12:56:13 -07:00
Dip