Putnam3145
b5890f60a7
Massively reduced oxygen req for bonfire
2021-09-17 15:50:20 -07:00
DeltaFire
3f1d060a38
hey raspy why can plastic golems always ventcrawl
2021-09-17 21:02:58 +02:00
f3550fd87c
blacklists morphine from dart guns, also haloperidol ( #15152 )
...
* Automatic changelog compile [ci skip]
* Automatic changelog compile [ci skip]
* Automatic changelog compile [ci skip]
* Automatic changelog compile [ci skip]
* Automatic changelog compile [ci skip]
* Automatic changelog compile [ci skip]
* Automatic changelog compile [ci skip]
* Automatic changelog compile [ci skip]
* Automatic changelog compile [ci skip]
* Automatic changelog compile [ci skip]
* Automatic changelog compile [ci skip]
* Automatic changelog compile [ci skip]
* Automatic changelog compile [ci skip]
* Automatic changelog compile [ci skip]
* Automatic changelog compile [ci skip]
* Automatic changelog compile [ci skip]
* Automatic changelog compile [ci skip]
* Automatic changelog compile [ci skip]
* Automatic changelog compile [ci skip]
* Automatic changelog compile [ci skip]
* Automatic changelog compile [ci skip]
* Automatic changelog compile [ci skip]
* Automatic changelog compile [ci skip]
* Automatic changelog compile [ci skip]
* Automatic changelog compile [ci skip]
* Automatic changelog compile [ci skip]
* Automatic changelog compile [ci skip]
* Automatic changelog compile [ci skip]
* Automatic changelog compile [ci skip]
* Automatic changelog compile [ci skip]
* Automatic changelog compile [ci skip]
* Automatic changelog compile [ci skip]
* yeag
* actually adds the blacklist
can't you feel my heart beat so, i can't let you go, want you in my life
* changes
* Update html/changelog.html
Co-authored-by: zeroisthebiggay <43571008+zeroisthebiggay@users.noreply.github.com >
Co-authored-by: Changelogs <action@github.com >
Co-authored-by: zeroisthebiggay <43571008+zeroisthebiggay@users.noreply.github.com >
2021-09-17 12:54:02 +02:00
Cognition
cd747b01fe
realized I can't place it on tables with how I set it up, woops.
2021-09-17 02:59:31 -07:00
Cognition
db511f4d7e
Regenerative extract nerfing
2021-09-17 02:23:06 -07:00
Putnam3145
ce0107dfdf
effective temperature for power increase too
2021-09-16 21:49:43 -07:00
buffyuwu
7dbcc81fd3
whoops
2021-09-16 14:23:21 -04:00
buffyuwu
43cd462d79
saltpr adding more suit slot clothing
...
adds three suit slot clothing items. the hoodies remade from the unused(?) hoodieskirt asset and the heartcoat comes from a redesign of the bartender's winter coat
2021-09-16 14:19:23 -04:00
zeroisthebiggay and GitHub
13e110ac43
Update prisoner.dm
2021-09-16 12:03:46 -04:00
Timothy Teakettle
7b2708b12b
Update mind_transfer.dm
2021-09-16 15:42:13 +01:00
Timothy Teakettle
d1dd46238a
Update access.dm
2021-09-16 15:30:39 +01:00
DeltaFire
146682d1ee
adds storage protocols to bepis
2021-09-16 03:41:49 +02:00
DeltaFire
a4d71fcfa4
-debug comment
2021-09-16 03:18:52 +02:00
DeltaFire
b02825c679
uh oh
2021-09-16 03:14:24 +02:00
qweq12yt
781a414c38
fix space heaters
2021-09-15 18:16:04 -03:00
silicons and GitHub
fb05100008
Update mouse.dm ( #15115 )
2021-09-15 00:16:57 +02:00
Lin and GitHub
d53820d9bf
Merge pull request #15130 from Citadel-Station-13/when_why
...
[02:58:00] Runtime in atoms.dm, line 574: type mismatch: "catghost" &= 16777215
2021-09-14 01:08:06 -05:00
silicons and GitHub
4af82878dc
Update uplink_ammo.dm ( #15141 )
2021-09-14 02:24:37 +02:00
silicons and GitHub
6524e3d539
Update species.dm ( #15126 )
2021-09-14 02:23:52 +02:00
silicons and GitHub
faed0eff01
Merge pull request #15099 from Hatterhat/tablets-gaming
...
tablets gaming - an NT IRN "buff"
2021-09-13 15:09:04 -07:00
silicons and GitHub
abbd3d7708
Merge pull request #15120 from LetterN/what-if-i-updated-mafia-yeah-right
...
Mafia updates
2021-09-13 15:08:50 -07:00
DeltaFire
f7bcfa57ae
safety
2021-09-13 23:28:02 +02:00
DeltaFire
a0fa118415
unfucks changes
2021-09-13 22:48:16 +02:00
DeltaFire
d6c9fb3594
Merge remote-tracking branch 'upstream/master' into clockcult-ai-conversion
2021-09-13 22:43:43 +02:00
DeltaFire
6664be64c7
change
2021-09-13 22:34:05 +02:00
Putnam3145 and GitHub
99908e17c5
Revert "Reworks supermatter gas output to be less cascade-y, more risky"
2021-09-13 11:39:32 -07:00
DeltaFire
6b572abd87
Merge remote-tracking branch 'upstream/master'
2021-09-13 20:08:39 +02:00
silicons and GitHub
47568e50bf
Merge pull request #15062 from zeroisthebiggay/patch-18
...
bread is no longer equipped on the head; instead you actually hold it in your mouth
2021-09-12 21:10:50 -07:00
silicons and GitHub
e342145663
Merge pull request #15070 from zeroisthebiggay/prisoners
...
prisoners - aka ports prisoners from tg hell yeah
2021-09-12 20:59:12 -07:00
silicons and GitHub
4f0d5e8c9a
Merge pull request #15112 from Putnam3145/fix-supermatter-cascade
...
Reworks supermatter gas output to be less cascade-y, more risky
2021-09-12 20:58:48 -07:00
silicons and GitHub
3a5f6e1649
Merge pull request #15113 from keronshb/unhuboxsm
...
Stops the SM from blowing things up
2021-09-12 20:58:36 -07:00
silicons and GitHub
8d72664eef
Merge pull request #15123 from keronshb/hitbyfix
...
Fixes a runtime with Hitby
2021-09-12 20:58:09 -07:00
silicons and GitHub
4c058114a6
Update login.dm
2021-09-12 20:37:03 -07:00
Putnam3145
137a30a047
more nerfs lol
2021-09-12 15:04:42 -07:00
zerothebigboy
d41648b365
dumbasskevinz
2021-09-11 23:34:02 -04:00
zerothebigboy
223ba8d6c1
why
2021-09-11 23:20:01 -04:00
zerothebigboy
f077f374bd
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into why
2021-09-11 23:04:48 -04:00
zerothebigboy
ba72e3d8f0
why
2021-09-11 23:04:21 -04:00
keronshb
4cb198fe05
Fixes Hitby runtime
2021-09-11 17:38:32 -04:00
Putnam3145
083704e29d
lowered max oxy mult, made temp not matter
2021-09-11 11:03:15 -07:00
Putnam3145
3965ad9dae
yeah that's just too much gas sorry
2021-09-11 10:25:39 -07:00
keronshb
b444afede3
ACTION BUTTON SLAM
2021-09-11 12:06:18 -04:00
silicons and GitHub
149d149dff
Merge pull request #15102 from timothyteakettle/icecream
...
allows custom taste text and color on the custom ice cream setting in the ice cream vat
2021-09-10 22:17:25 -07:00
Letter N and GitHub
de4311e4d9
shut up
2021-09-11 12:50:06 +08:00
LetterN
791da1b9b4
mafia update.
2021-09-11 11:38:15 +08:00
keronshb
0233f2123f
Slaughter Fix and Buff
2021-09-10 21:00:28 -04:00
zerothebigboy
68e2eb1d7a
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into prisoners
2021-09-10 12:12:57 -04:00
keronshb
bb74dd4adf
Cap fix
2021-09-10 12:01:46 -04:00
silicons and GitHub
fd785c6abf
Merge pull request #15063 from zeroisthebiggay/intern
...
ports various tg armor resprites and some such
2021-09-10 00:16:54 -07:00
silicons and GitHub
4836f222d0
Merge pull request #15097 from LetterN/generic-housekeeping-pr
...
Generic syncs
2021-09-10 00:16:25 -07:00
Putnam3145