Lin
d5c17f0d84
Merge pull request #15376 from SandPoot/double
...
Double beds
2021-11-24 17:38:10 +00:00
Chayse Ramsay
31a0de04d5
Fixes chem nades too, since fixing grenades as a whole broke them changing timer
2021-11-21 06:24:55 +00:00
Chayse Ramsay
9545b180c6
Update grenade.dm
2021-11-21 06:08:20 +00:00
LetterN
8dcfea5817
Merge remote-tracking branch 'origin/master' into what-should-i-name-this-branch
2021-11-21 10:34:14 +08:00
Lin
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
Putnam3145
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
buffyuwu
612087f7e5
Update crayons.dm
2021-11-18 20:44:01 -05:00
DeltaFire
ef9c90d512
embeds, unarmed and wounds
2021-11-16 20:26:38 +01:00
Putnam3145
1da28b8ec6
Chem gas tweaks, + toxins rebalance
2021-11-15 16:29:30 -08:00
SandPoot
5b85c260a7
Upload files
2021-11-15 01:34:30 -03:00
DeltaFire
6224da71a3
contents_explosion
...
at least this one had less overrides.
2021-11-14 21:41:42 +01:00
DeltaFire
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
DeltaFire
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
keronshb
632b1b36cc
Fixes crayons
2021-11-11 20:10:57 -05:00
LetterN
8b16653744
Merge remote-tracking branch 'origin/master' into what-should-i-name-this-branch
2021-11-12 08:50:23 +08:00
keronshb
659d7aa715
Merge remote-tracking branch 'upstream/master' into familyport
2021-11-11 19:35:40 -05:00
silicons
5b5eca2beb
Merge pull request #15322 from SandPoot/crayon-precision
...
Crayon precision mode
2021-11-09 09:56:03 -08:00
keronshb
9153115566
Merge remote-tracking branch 'upstream/master' into familyport
2021-11-05 10:50:08 -04:00
SandPoot
d92a290960
Update crayons.dm
2021-11-01 01:50:30 -03:00
SandPoot
05717c7ae3
Upload files
2021-11-01 01:24:47 -03:00
LetterN
f9ce0759a3
indentation moment
2021-10-30 14:25:44 +08:00
LetterN
89f7cf1c32
i apparently didnt commit this?
2021-10-30 13:46:54 +08:00
LetterN
1fc778f70a
soundloop fix. also it gets deleted (woo)
2021-10-30 13:16:31 +08:00
silicons
186b552103
merge
2021-10-29 21:50:58 -07:00
LetterN
a057139c33
Merge remote-tracking branch 'origin/master' into what-should-i-name-this-branch
2021-10-30 11:54:20 +08:00
LetterN
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
keronshb
8978ee10fe
Merge remote-tracking branch 'upstream/master' into familyport
2021-10-28 14:41:46 -04:00
keronshb
c80d65df73
Merge branch 'master' into familyport
2021-10-28 14:34:20 -04:00
Letter N
bcdf96f274
Revert "TGUI alerts, lists, inputs"
2021-10-28 12:17:29 +08:00
silicons
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
SandPoot
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
silicons
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
silicons
d6d037de43
Merge pull request #15232 from Putnam3145/minesweeper-removal
...
Removes minesweeper
2021-10-27 05:11:48 -07:00
WanderingFox95
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
keronshb
ff9439d223
Dsword Wound and slowdown fix
2021-10-22 23:04:19 -04:00
SandPoot
45ef0fe5ca
closes #15278
2021-10-17 21:40:39 -03:00
SandPoot
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
Hatterhat
7e7a5af53a
brought to you by neilcic - Floor Corn
2021-10-16 05:00:15 -05:00
keronshb
6b23d177c8
Merge remote-tracking branch 'upstream/master'
2021-10-15 19:25:41 -04:00
keronshb
13140f9bb9
Somewhat fixed huds and stuff, not 100%
2021-10-14 16:36:18 -04:00
keronshb
6331ced3e5
The rest of the offering stuff
2021-10-13 22:13:33 -04:00
keronshb
e2ab532de2
Removes old gangs, families is almost ready
2021-10-12 16:34:27 -04:00
keronshb
bd7a2b6a2a
Lets families compile
2021-10-12 16:12:38 -04:00
keronshb
41013ec815
Part 2 - Missing stuff from original families port
2021-10-12 12:07:02 -04:00
keronshb
0bae06adcd
Original Port
2021-10-11 22:00:54 -04:00
SandPoot
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
keronshb
e5f66413c8
fat dart
...
no idea what this even is
2021-10-08 17:28:25 -04: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
76fa85e683
Cyborg module sorting fixed ( #15241 )
2021-10-06 17:16:10 +02:00
