1de965a90e
Merge pull request #15385 from buffyuwu/crayons.dm
...
dont color my entire canvas neon green when im painting please
2021-11-20 03:36:38 +00:00
d395824007
Merge pull request #15383 from MrJWhit/thinnining-trash
...
Thins up the loot piles
2021-11-20 03:35:56 +00:00
99dedb54ed
Merge remote-tracking branch 'upstream/master' into admin_mapsave
2021-11-20 00:16:56 +02:00
cf4cc39a3b
Merge pull request #15222 from raspy-on-osu/apcfix
...
save hours of pain for new engineers with this one simple trick!! click here to find out
2021-11-18 20:18:11 -08:00
612087f7e5
Update crayons.dm
2021-11-18 20:44:01 -05:00
47cf0c153a
Update loot_pile.dm
2021-11-17 18:36:49 -05:00
efa02148d1
Merge pull request #15275 from keronshb/halloweenball2021
...
Spookystation (Ball Map) and Vector Cars
2021-11-17 16:26:07 +00:00
ef9c90d512
embeds, unarmed and wounds
2021-11-16 20:26:38 +01:00
fa6946fae4
added the funny. Also adds balloon_alert to more stuff (primarily atmos)
2021-11-16 16:10:12 +08:00
1da28b8ec6
Chem gas tweaks, + toxins rebalance
2021-11-15 16:29:30 -08:00
ca3eaca314
update bedsheet_bin.dm
2021-11-15 20:48:11 -03:00
5b85c260a7
Upload files
2021-11-15 01:34:30 -03:00
6224da71a3
contents_explosion
...
at least this one had less overrides.
2021-11-14 21:41:42 +01:00
6aa906395c
not a gaius reference
...
hhhh let me just replace all the ex_acts missing some args and adjust them
2021-11-14 21:34:59 +01:00
eb98848a9f
wires this code to the PROPER prefs
2021-11-14 09:23:08 +08:00
b4e6b0785d
chemscan
...
chemscanning (reads: health analyzers mostly) show reagents in grey if not processable due to being invalid
2021-11-12 19:38:10 +01:00
632b1b36cc
Fixes crayons
2021-11-11 20:10:57 -05:00
8b16653744
Merge remote-tracking branch 'origin/master' into what-should-i-name-this-branch
2021-11-12 08:50:23 +08:00
659d7aa715
Merge remote-tracking branch 'upstream/master' into familyport
2021-11-11 19:35:40 -05:00
0aceecee2e
w hitsound
2021-11-10 16:49:18 -05: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
9153115566
Merge remote-tracking branch 'upstream/master' into familyport
2021-11-05 10:50:08 -04:00
74c6e05dd7
Merge pull request #15318 from silicons/evil
...
removes some evil defines from the code
2021-11-04 04:32:48 +00:00
efd12e4fd5
Changes for merge
2021-11-01 12:07:44 -04: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
8978ee10fe
Merge remote-tracking branch 'upstream/master' into familyport
2021-10-28 14:41:46 -04:00
c80d65df73
Merge branch 'master' into familyport
2021-10-28 14:34:20 -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
bfcdf83e55
buildmode mapgen tool save
2021-10-26 16:31:36 +03:00
Lin