Lin
1adbf914c2
Merge pull request #15414 from BlueWildrose/wingport
...
TG wing ports with some Citadel additions. All species can now use the flight potion and grow (unique) wings.
2022-02-21 00:02:21 +00:00
silicons
5b75509603
Merge pull request #15265 from keronshb/familyport
...
(Ready for Testing) Ports MRP Families and hardsync
2022-02-13 02:32:26 -08:00
silicons
4632c85d71
silly proof of concept item ( #15456 )
...
* should have listened to putnam
* why am i doing this
* that
* lmao
* more
* it compiles
* it compiles
* fixes
* FUNNY GLOW SWORD
* more..
* unterminated text
* wthat wasn't working
* it's coming together
* woo
* what have i done
* fin.
* eh
2022-02-11 21:04:21 -08:00
keronshb
f1ca283318
Merge branch 'master' into familyport
2022-02-11 14:04:57 -05:00
silicons
9205545d16
Merge pull request #15317 from LetterN/what-should-i-name-this-branch
...
TGUI hardsync & stuff
2022-01-25 00:06:59 -08:00
silicons
f601580854
Merge pull request #15430 from DeltaFire15/synth-coolant
...
Synth stuff : Balancing Nightmare Edition (aka, coolant)
2022-01-22 13:59:12 -08:00
LetterN
18b7069f1f
Merge remote-tracking branch 'origin/master' into what-should-i-name-this-branch
2022-01-11 09:49:38 +08:00
Lin
41be63dbbc
Merge pull request #15452 from Hatterhat/jump-timbs
...
your jordans are fake - adds a mining boot skin for jumpboots
2022-01-03 22:34:38 +00:00
Lin
2379a2a342
Merge pull request #15370 from Putnam3145/genericized-plasma-trit
...
Total fire overhaul + new atmos stuff + uh oh stinky toxins nerf + sauna buff + ??
2022-01-03 22:31:40 +00:00
DeltaFire
074fe5b417
a bunch of stuff
...
5° min temp adjustment for active cooling
150% max total cooling efficiency as opposed to 100%
passive heating cools instead at >100% efficiency (to -30°C min)
EMPs jam cooling system readouts.
Nanogel is now printable, for a decent price though it needs a bit of diamond.
2022-01-02 19:44:35 +01:00
Hatterhat
cd0c2aa496
your jordans are fake
2022-01-02 04:33:25 -06:00
DeltaFire
2940d141cf
please-dont-smite-us-lummox
2022-01-01 07:10:35 +01:00
LetterN
fab4b07be5
Merge remote-tracking branch 'origin/master' into what-should-i-name-this-branch
2021-12-21 07:59:33 +08:00
DeltaFire
0faac6dce6
hoo boy
2021-12-14 23:06:42 +01:00
BlueWildrose
0e3d30e59f
Merge branch 'Citadel-Station-13:master' into wingport
2021-12-11 12:53:03 -07:00
DeltaFire
50be57f107
grrrr
2021-12-08 18:33:06 +01:00
Cognition
3b52782ae5
Merge branch 'master' into wingport
2021-12-08 00:02:13 -07:00
DeltaFire
04797a961b
linters b gone
2021-12-08 05:07:22 +01:00
Cognition
318240bdc6
TG wing port - Now YOU TOO, can be an "angel"
2021-12-07 18:59:07 -07:00
Lin
e506bc50dc
Merge pull request #15335 from DeltaFire15/synth-chem-time
...
Synth / IPC kinda-buffs - Chemwarfare Edition
2021-12-01 00:39:02 +00:00
Lin
5dc9704e5d
Merge pull request #15380 from DeltaFire15/oops-all-wounds
...
Block & Pellet wound pass
2021-11-30 20:24:42 +00:00
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
