keronshb
02eb4685a9
Some adjustments
2021-10-28 23:44:02 -04:00
keronshb
ccb65156ac
Adjustments and fixes
2021-10-26 12:53:50 -04:00
keronshb
50986b279e
Requirement rework
2021-10-25 21:14:25 -04:00
silicons
d17419ed54
Merge pull request #15256 from keronshb/fatdart
...
no idea what this thing even is but he's chuffin back a fat dart and that's all that matters
2021-10-15 00:18:39 -07:00
silicons
91e7cb293c
Merge pull request #15223 from Hatterhat/yeehaw-box
...
The Yeehaw Update - makes .38 lever-actions slightly more accessible
2021-10-11 20:45:42 -07:00
Timothy Teakettle
11df2bb77c
fixes emps not working on lockers ( #15259 )
...
* Update closets.dm
* Update code/game/objects/structures/crates_lockers/closets.dm
Co-authored-by: DeltaFire <46569814+DeltaFire15@users.noreply.github.com >
Co-authored-by: DeltaFire <46569814+DeltaFire15@users.noreply.github.com >
2021-10-11 00:48:00 +02:00
Lin
2085279590
Merge pull request #15252 from SandPoot/tooltip-related-fixes
...
Tooltip related fixes
2021-10-08 22:31:23 -07:00
keronshb
e5f66413c8
fat dart
...
no idea what this even is
2021-10-08 17:28:25 -04:00
Putnam3145
3cfaad31c1
Merge pull request #15149 from keronshb/dynamicport
...
(Probably ready for test merge) DYNAMIC 2021
2021-10-07 18:14:59 -07:00
keronshb
5c562959a9
Allows midround budget to be spent in extended
2021-10-07 14:12:37 -04:00
SandPoot
3de08a74e7
Upload files
2021-10-07 12:32:20 -03:00
Putnam3145
fedf409a5d
Merge pull request #15105 from Citadel-Station-13/silicons-patch-7
...
comedically controversial stunbaton """"buff""""
2021-10-07 00:05:45 -07:00
Putnam3145
8be5dba86a
Merge pull request #15127 from Citadel-Station-13/silicons-patch-14
...
chaplain runspeed holy weapon will now only give a random slowdown/speedup of 6 tiles which for the most part ignores all other slowdowns/speedups, instead of randomizing between slowing to a crawl and running faster than the speed of light
2021-10-07 00:05:24 -07:00
Chayse Ramsay
d1611ddf42
Lavaland ruin rad storm fix ( #15242 )
...
* Lavaland rad storm fix
* whoops
* double whoops
* Update Lavaland.dmm
2021-10-06 17:28:29 +02:00
Chayse Ramsay
76fa85e683
Cyborg module sorting fixed ( #15241 )
2021-10-06 17:16:10 +02:00
Lin
8f9a2b6d0c
Merge pull request #15235 from silicons/pai_radio_Stuff
...
redoes how pai emp silencing works
2021-10-05 12:32:23 -07:00
Lin
1b8c72285f
Merge pull request #15236 from silicons/decon
...
fixes computer boards disappearing on decon
2021-10-05 12:14:00 -07:00
Lin
b18fbe695a
Merge pull request #15233 from SandPoot/misc-fixes
...
Some random fixes
2021-10-05 10:27:19 -07:00
silicons
f5e52f810d
I HATE YOU
2021-10-03 13:54:58 -07:00
silicons
715251dea1
wack
2021-10-03 13:25:30 -07:00
silicons
bac7bc3fb6
fix
2021-10-03 11:29:32 -07:00
silicons
f024318810
Merge pull request #14958 from WanderingFox95/WanderingFox95-TribalOverhaul
...
Tribal Crafting Overhauled & Expanded
2021-10-03 11:20:55 -07:00
silicons
31467420d7
Merge pull request #15221 from SandPoot/colormate
...
Colormate tgui + minor tgui updates
2021-10-03 08:51:51 -07:00
SandPoot
1c80169f22
Update shields.dm
2021-10-02 22:35:54 -03:00
SandPoot
95b814d47e
Upload files
2021-10-02 22:29:01 -03:00
WanderingFox95
83987db48a
Merge branch 'Citadel-Station-13:master' into WanderingFox95-TribalOverhaul
2021-10-01 18:51:46 +02:00
Hatterhat
1d005db9a8
THE YEEHAW UPDATE
2021-09-30 23:10:33 -05:00
keronshb
4e91dde6b0
Timer fix and dead list removal
2021-09-30 14:50:04 -04:00
Putnam3145
a0a9089ce0
Removes "play on same board" from minesweeper ( #15217 )
2021-09-29 18:52:05 +02:00
SandPoot
b23b88524d
Upload files
2021-09-28 22:03:17 -03:00
silicons
5ff4a2ace5
Merge pull request #15180 from LetterN/achives-
...
Achivement & Clowncar update
2021-09-28 00:15:52 -07:00
keronshb
5868c90fe8
Wizard fixes
2021-09-27 22:28:44 -04:00
keronshb
eb548eb9b3
Fixes antag prefs breaking
2021-09-27 20:03:42 -04:00
Jordan Brown
2db0511d0d
Removes a dead var
2021-09-27 12:20:37 -04:00
keronshb
5da5ac396c
Head blacklist for antag
2021-09-26 14:29:46 -04:00
keronshb
af2777a604
Citadel weight adjustments and config
2021-09-25 17:56:15 -04:00
keronshb
fb5653e12c
Voting fix
2021-09-25 12:59:18 -04:00
keronshb
a6bfff92cc
Fixes pirates, re adds extended, re adds voting
2021-09-24 19:40:56 -04:00
keronshb
cbe221e18f
Adds more blackbox stuff
2021-09-23 19:57:51 -04:00
keronshb
c9697f4bbf
Fixes dynamic
2021-09-23 19:38:15 -04:00
WanderingFox95
d8aa29a16e
Merge branch 'Citadel-Station-13:master' into WanderingFox95-TribalOverhaul
2021-09-21 14:49:15 +02:00
Lin
ab7b4e3eec
Merge pull request #15181 from Citadel-Station-13/typecaches
...
no more powergaming dice bags
2021-09-20 23:59:53 -05:00
Lin
7a5e748344
Merge pull request #15185 from Citadel-Station-13/silicons-patch-6
...
fixes airlock deflection
2021-09-20 23:53:53 -05:00
WanderingFox95
c99df01c87
Merge branch 'Citadel-Station-13:master' into WanderingFox95-TribalOverhaul
2021-09-20 00:16:27 +02:00
keronshb
c8814e8cc8
Merge remote-tracking branch 'upstream/master' into dynamicport
2021-09-19 18:09:18 -04:00
keronshb
13323d2597
Merge branch 'master' into dynamicport
2021-09-19 17:59:09 -04:00
keronshb
0b5a7c9759
OOPS FORGOT PIRATES and some blacklists
2021-09-19 17:56:26 -04:00
silicons
6d99bca184
Update obj_defense.dm
2021-09-19 14:46:09 -07:00
silicons
84a26eeabd
Update obj_defense.dm
2021-09-19 14:45:24 -07:00
WanderingFox95
fe8a652689
Merge branch 'Citadel-Station-13:master' into WanderingFox95-TribalOverhaul
2021-09-19 21:32:03 +02:00
