eb98848a9f
wires this code to the PROPER prefs
2021-11-14 09:23:08 +08:00
8b16653744
Merge remote-tracking branch 'origin/master' into what-should-i-name-this-branch
2021-11-12 08:50:23 +08:00
9a24f89780
THE fix
2021-11-10 10:33:15 +08:00
5b5eca2beb
Merge pull request #15322 from SandPoot/crayon-precision
...
Crayon precision mode
2021-11-09 09:56:03 -08:00
74c6e05dd7
Merge pull request #15318 from silicons/evil
...
removes some evil defines from the code
2021-11-04 04:32:48 +00:00
d92a290960
Update crayons.dm
2021-11-01 01:50:30 -03:00
05717c7ae3
Upload files
2021-11-01 01:24:47 -03:00
b6ad2f6a6b
Merge pull request #15312 from keronshb/evergreen
...
The grinch can no longer steal Christmas.
2021-10-30 14:08:59 -07:00
f9ce0759a3
indentation moment
2021-10-30 14:25:44 +08:00
89f7cf1c32
i apparently didnt commit this?
2021-10-30 13:46:54 +08:00
1fc778f70a
soundloop fix. also it gets deleted (woo)
2021-10-30 13:16:31 +08:00
186b552103
merge
2021-10-29 21:50:58 -07:00
a057139c33
Merge remote-tracking branch 'origin/master' into what-should-i-name-this-branch
2021-10-30 11:54:20 +08:00
99019166e4
i think it works
...
MAJOR antag backend update
- you cannot bruteforce the pen anymore
- uplink now uses bitflag to lock purchases
- poplock is handled entirely by the buyable uplink items
- tgui antag intro (for selected ones)
2021-10-30 11:45:50 +08:00
319c5e23fe
Merge pull request #15309 from LetterN/revert-15244-tgui-alerts-and-what-not
...
Revert "TGUI alerts, lists, inputs"
2021-10-29 20:27:46 -07:00
5054ea87ce
Merge pull request #15310 from keronshb/jaqincinerator
...
No Frollo you can't burn Jacq in the cremator with hellfire (plus two other grief prevention additions)
2021-10-28 21:29:50 -07:00
e531c7b452
Fix
2021-10-28 18:48:26 -04:00
6dcf4fae9f
No stealing christmas
2021-10-28 11:28:59 -04:00
f7b898a2a9
frontend
2021-10-28 17:34:52 +08:00
49940c373e
tgui backend
2021-10-28 12:51:31 +08:00
e8c56c07ee
No burning the spirit of halloween
2021-10-28 00:43:02 -04:00
bcdf96f274
Revert "TGUI alerts, lists, inputs"
2021-10-28 12:17:29 +08:00
9010dc1e41
Merge pull request #15298 from keronshb/whocodedthis
...
Fixes DSword and Hyper Eu's wounding, and fixes a slowdown bug with Hyper Eu.
2021-10-27 13:35:41 -07:00
13d7a166fe
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into tgui-alerts-and-what-not
2021-10-27 13:54:49 -03:00
679189cb3d
Merge pull request #15277 from Hatterhat/autoloom
...
i've been sitting on this a while but here have the AUTOLOOM
2021-10-27 05:13:40 -07:00
cbc266214d
Merge pull request #15303 from Linzolle/ghostcafe-plasma
...
make plasmemes not die in ghost cafe
2021-10-27 05:12:22 -07:00
d6d037de43
Merge pull request #15232 from Putnam3145/minesweeper-removal
...
Removes minesweeper
2021-10-27 05:11:48 -07:00
4b13d1772c
[Ready] Bone Anvil and processable Bone ingots ( #15290 )
...
* Adding all the extra stuff
* whoops, slipped my last fix in here.
* bone balance
* 6 Goliaths + 3 Watchers + 1 Legion
* bumps the damage modifier down to 1.05
* More Bones.
* Undoes the undoing of the other fix PR
Co-authored-by: Emily <null>
2021-10-25 18:11:54 +02:00
a4a72b1b16
make plasmemes not die in ghost cafe
2021-10-24 17:27:32 -07:00
ff9439d223
Dsword Wound and slowdown fix
2021-10-22 23:04:19 -04:00
45ef0fe5ca
closes #15278
2021-10-17 21:40:39 -03:00
1561138350
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into tgui-alerts-and-what-not
2021-10-16 14:11:00 -03:00
7e7a5af53a
brought to you by neilcic - Floor Corn
2021-10-16 05:00:15 -05:00
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
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
829ca8b9a7
Merge branch 'master' into tgui-alerts-and-what-not
2021-10-11 20:41:56 -03:00
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
2085279590
Merge pull request #15252 from SandPoot/tooltip-related-fixes
...
Tooltip related fixes
2021-10-08 22:31:23 -07:00
437b3105d1
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into tgui-alerts-and-what-not
2021-10-08 21:05:41 -03:00
e5f66413c8
fat dart
...
no idea what this even is
2021-10-08 17:28:25 -04:00
3de08a74e7
Upload files
2021-10-07 12:32:20 -03:00
fedf409a5d
Merge pull request #15105 from Citadel-Station-13/silicons-patch-7
...
comedically controversial stunbaton """"buff""""
2021-10-07 00:05:45 -07:00
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
76fa85e683
Cyborg module sorting fixed ( #15241 )
2021-10-06 17:16:10 +02:00
5aa12b4716
There's a bounty for this right? i spent nearly two full days at this
2021-10-05 18:10:32 -03:00
8f9a2b6d0c
Merge pull request #15235 from silicons/pai_radio_Stuff
...
redoes how pai emp silencing works
2021-10-05 12:32:23 -07:00
b18fbe695a
Merge pull request #15233 from SandPoot/misc-fixes
...
Some random fixes
2021-10-05 10:27:19 -07:00
bbe32fa38a
Upload files
2021-10-05 00:33:49 -03:00
bac7bc3fb6
fix
2021-10-03 11:29:32 -07:00
1c80169f22
Update shields.dm
2021-10-02 22:35:54 -03:00
LetterN