shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
37,880 Commits 5 Branches 0 Tags
348341ed80d99508ec400a779a7e669d08dd0dee
Commit Graph

8742 Commits

Author SHA1 Message Date
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
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
Timothy Teakettle
f1cd94fc97 emp rework 2020-09-09 23:14:06 +01:00
silicons
9e204f167f Merge pull request #12452 from Trilbyspaceclone/spike-loot-differentces 
Miner Loot Shuffle MK III
 2020-09-06 01:58:46 -07:00
BlackMajor
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
BlackMajor
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
BlackMajor
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
BlackMajor
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
silicons
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
silicons
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
silicons
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
silicons
a58a67f90c Merge pull request #13339 from Putnam3145/dynamic-event-decouples 
Completely decouples events from dynamic.
 2020-09-05 02:12:00 -07:00
raspy-on-osu
4c8983f006 init 2020-09-04 22:13:56 -04:00
silicons
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
silicons
80633fbc3c Merge pull request #13336 from Putnam3145/fix-threat-removal 
Fixes threat adjustment in the game panel not to always go up.
 2020-09-04 12:55:32 -07:00
silicons
12c5680d58 Merge pull request #13324 from Putnam3145/extools-logging 
Added threaded extools logging as an alternative to rust_g logging.
 2020-09-04 04:10:02 -07:00
Putnam
4ef4220c88 Completely decouples events from dynamic. 2020-09-03 16:38:16 -07:00
Putnam
7dea04dca4 Wow, turns out negative*negative = positive, WHO KNEW. 2020-09-03 04:38:41 -07:00
Ghommie
dc9b024fae Blemishes begone. 2020-09-02 19:16:16 +02:00
Putnam
7b8f7aafa8 okay no it's probably this. 2020-09-02 00:57:28 -07:00
GrayRachnid
a7a8bb7992 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into revert-8235-defib-notouch 2020-09-01 23:57:06 -04:00
lolman360
5697ab2ff4 Merge remote-tracking branch 'upstream/master' into AnPrimAssistants 2020-09-01 16:57:02 +10:00
silicons
9a4f9aef6e Merge pull request #13307 from raspy-on-osu/pyroanomaly-slimespawn-spam 
pyro anomaly spam salt pr (offer_control now supports ignore_category)
 2020-08-31 21:21:09 -07:00
silicons
db28a50953 Merge pull request #13310 from Putnam3145/fix-fusion-display 
Makes fusion analyze not assume we're still on fusion v5
 2020-08-31 21:20:15 -07:00
silicons
1670b6f2a6 Merge pull request #13313 from Putnam3145/plastitanium-rapier-fix 
Makes plastitanium rapier not silently poison for pacifists.
 2020-08-31 21:19:09 -07:00
Putnam
2f3edb4491 Added threaded extools logging as an alternative to rust_g logging. 2020-08-31 19:56:49 -07:00
lolman360
05bd0579ca Merge remote-tracking branch 'upstream/master' into AnPrimAssistants 2020-09-01 11:23:57 +10:00
silicons
ee0d86f201 fix 2020-08-31 14:14:53 -07:00
Putnam
6028c66ceb Fixed the combat log issue 2020-08-30 08:26:29 -07:00
Putnam
4cf040a11a Makes plastitanium rapier not silently poison for pacifists. 2020-08-30 06:25:00 -07:00
Putnam
9da959795c Made the text make sense, again. 2020-08-30 05:42:21 -07:00
Putnam
15b5b77494 Replaced all the references of fusionpower to instability in results. 2020-08-30 03:06:36 -07:00
Putnam
5ba883bfe5 Fixes fusion power text to make sense. 2020-08-30 02:53:46 -07:00
silicons
69f6927275 Update broom.dm (#13058) 2020-08-30 09:52:54 +02:00
raspy-on-osu
c90c46a2d1 mob_spawners 2020-08-30 01:50:55 -04:00
Putnam3145
7c5197f383 Merge pull request #13249 from Citadel-Station-13/silicons-patch-25 
removes firedoor autoopen on touch
 2020-08-29 22:34:43 -07:00
Trilbyspaceclone
9c8f3305bb Merge branch 'master' into spike-loot-differentces 2020-08-30 00:41:42 -04:00
silicons
bf27de1aec Merge pull request #13292 from Putnam3145/fix-dynamic-again 
Rolling dynamic tweaks 'til it works
 2020-08-29 21:41:06 -07:00
silicons
1ed712d69d Merge pull request #13302 from necromanceranne/mecha_backstab_fix_port 
ports #52214 from /tg/: fix for mecha backstabbing
 2020-08-29 21:40:13 -07:00
silicons
9250a6d71d Merge pull request #13275 from Chiirno/portable-chem-mixer 
Portable chem mixer
 2020-08-29 21:34:57 -07:00
silicons
16fec8831a Merge pull request #13230 from Detective-Google/reskin-obj 
reskin_obj is now a radial
 2020-08-29 21:33:28 -07:00
silicons
413ccdba96 Merge pull request #13192 from Putnam3145/literal-hugbox 
Buffs/hugboxes slaughter demons
 2020-08-29 21:32:58 -07:00
GrayRachnid
1234b51e82 Revert "Buffs defib users by making them stop pulling automatically" 2020-08-30 00:24:31 -04:00
silicons
4a3b6054d3 Merge pull request #13266 from Ghommie/Ghommie-cit836 
Fixing some mistakes with the priority overlays removal PR.
 2020-08-29 21:22:44 -07:00
silicons
8cc84152d8 Merge pull request #13267 from Arturlang/op_slimes 
Lets slime damage structures
 2020-08-29 21:22:27 -07:00
Putnam
669bab841c Made cost being more than threat delta more punished. 2020-08-29 20:44:45 -07:00
Putnam
19b856aebf Removed story's curve. 2020-08-29 20:23:11 -07:00