keronshb
|
c8814e8cc8
|
Merge remote-tracking branch 'upstream/master' into dynamicport
|
2021-09-19 18:09:18 -04:00 |
|
keronshb
|
cd00d1589e
|
fucking hell
|
2021-09-19 18:06:24 -04:00 |
|
silicons
|
204867763b
|
Merge branch 'master' into silicons-patch-1
|
2021-09-19 15:00:30 -07:00 |
|
keronshb
|
13323d2597
|
Merge branch 'master' into dynamicport
|
2021-09-19 17:59:09 -04:00 |
|
keronshb
|
0b5a7c9759
|
OOPS FORGOT PIRATES and some blacklists
|
2021-09-19 17:56:26 -04:00 |
|
silicons
|
17cd5c5d84
|
Update mobs.dm
|
2021-09-19 13:46:08 -07:00 |
|
zeroisthebiggay
|
7fce515ca4
|
Update robot_modules.dm
|
2021-09-19 16:01:29 -04:00 |
|
zeroisthebiggay
|
4ab88cfcdb
|
Update robot_modules.dm
|
2021-09-19 15:59:45 -04:00 |
|
zeroisthebiggay
|
2f903353a6
|
Update robot_modules.dm
|
2021-09-19 15:56:40 -04:00 |
|
WanderingFox95
|
fe8a652689
|
Merge branch 'Citadel-Station-13:master' into WanderingFox95-TribalOverhaul
|
2021-09-19 21:32:03 +02:00 |
|
zerothebigboy
|
c6ce359cda
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into ninjasarecum
# Conflicts:
# tgstation.dme
|
2021-09-19 15:23:52 -04:00 |
|
silicons
|
b752cb0af2
|
Update parts.dm
|
2021-09-19 11:38:12 -07:00 |
|
silicons
|
c9662f76ed
|
Update parts.dm
|
2021-09-19 11:35:52 -07:00 |
|
silicons
|
c60e54e0d3
|
Merge pull request #15074 from keronshb/paiports
PORTS PAI Emag Act
|
2021-09-19 11:12:02 -07:00 |
|
silicons
|
c4386c0a4f
|
Merge pull request #15175 from buffyuwu/hallucination
meme pr that adds a hallunciation sound
|
2021-09-19 11:11:05 -07:00 |
|
silicons
|
f48bf3cdc0
|
Merge pull request #15174 from buffyuwu/holoparasites
probably fixes holoparasites
|
2021-09-19 11:10:45 -07:00 |
|
silicons
|
97213c94d8
|
Merge pull request #15178 from zeroisthebiggay/soup
all medipens get inhands
|
2021-09-19 11:09:01 -07:00 |
|
silicons
|
ae1b7803fa
|
Merge pull request #15172 from Putnam3145/bonfire-always-works-lavaland
Massively reduced oxygen req for bonfire
|
2021-09-19 11:08:56 -07:00 |
|
silicons
|
9a393e07f8
|
Merge pull request #15171 from DeltaFire15/ventcrawl-I-want-to-cry
Hey raspy why can plastic golems ventcrawl even with equipment?
|
2021-09-19 11:08:45 -07:00 |
|
silicons
|
54993928b2
|
Merge pull request #15167 from BlueWildrose/regenerativenerf
Xenobio regenerative extract nerfing - Hold still for 5 seconds to use on others, 1 second for self, adds stackable disgust when used
|
2021-09-19 11:08:10 -07:00 |
|
keronshb
|
1f71740803
|
.
|
2021-09-19 14:08:01 -04:00 |
|
silicons
|
9ac585c7f4
|
Merge pull request #15166 from Putnam3145/wider-effective-temperature
Supermatter has capped effective temperature for power increase too
|
2021-09-19 11:07:45 -07:00 |
|
silicons
|
abb89d9af0
|
Merge pull request #15163 from buffyuwu/clothing
saltpr adding more suit slot clothing
|
2021-09-19 11:07:32 -07:00 |
|
silicons
|
2bf73138fa
|
Merge pull request #15157 from DeltaFire15/nanite-storage
Storage nanite designs are no longer inaccessible
|
2021-09-19 11:07:13 -07:00 |
|
silicons
|
9d02cf4734
|
Merge pull request #15160 from timothyteakettle/xor-update
removes passkey from access circuits as it's not used anymore
|
2021-09-19 11:07:02 -07:00 |
|
silicons
|
df4732a6e6
|
Merge pull request #15161 from timothyteakettle/prefbreaking-is-bad
the mind transfer spell now releases people from vore bellies prior to the mind transfer
|
2021-09-19 11:06:51 -07:00 |
|
silicons
|
35948bec02
|
Merge pull request #15162 from zeroisthebiggay/patch-23
prisoners cannot latejoin anymore
|
2021-09-19 11:06:40 -07:00 |
|
silicons
|
c04f0cb953
|
Merge pull request #15154 from qweq12yt/test
[Fix] Fixes Space Heater behavior
|
2021-09-19 11:06:15 -07:00 |
|
silicons
|
ffa1355a33
|
Merge pull request #15139 from DeltaFire15/catsurgeon-badspawn
The cat surgeon event now prefers using "safe" turfs as spawn location
|
2021-09-19 11:04:59 -07:00 |
|
silicons
|
c16f29ffb2
|
Merge pull request #15137 from DeltaFire15/clockcult-ai-conversion
Allows clock cultists to convert carded AIs by placing their card onto a conversion sigil
|
2021-09-19 11:04:50 -07:00 |
|
silicons
|
d90483c428
|
Merge pull request #15119 from keronshb/slaughterbuff
Fixes Slaughter Demon, gives it an action button, and a slight buff
|
2021-09-19 11:03:18 -07:00 |
|
silicons
|
1bc24575d4
|
Merge pull request #15084 from keronshb/plaguefix
Fixes Plague Rats + other buffs
|
2021-09-19 11:03:05 -07:00 |
|
keronshb
|
6cc4e35b44
|
Mob lists
|
2021-09-19 13:28:41 -04:00 |
|
buffyuwu
|
8a207d7ebd
|
three more loadout clothing items
made from (many) edits to the gothcoat and blackwizard clothing items respectively
|
2021-09-19 03:01:02 -04:00 |
|
LetterN
|
0b7e514739
|
t
|
2021-09-19 14:05:28 +08:00 |
|
silicons
|
849dbc7fb3
|
sigh
|
2021-09-18 19:37:24 -07:00 |
|
zerothebigboy
|
4c82eeeb2a
|
soup
|
2021-09-18 18:18:04 -04:00 |
|
timothyteakettle
|
c506289e6f
|
removes remaining references
|
2021-09-18 14:24:20 +01:00 |
|
timothyteakettle
|
366bab9dbf
|
removes the passkey
|
2021-09-18 10:47:50 +01:00 |
|
buffyuwu
|
bdf46b1d46
|
meme pr
|
2021-09-18 04:53:17 -04:00 |
|
Cognition
|
37c480a7a4
|
1 second for self-use
|
2021-09-17 23:12:55 -07:00 |
|
buffyuwu
|
96643c7aba
|
probably fixes holoparasites
closes #15151 if it works
|
2021-09-18 01:22:24 -04:00 |
|
silicons
|
ae513d3114
|
feautre
|
2021-09-17 21:58:26 -07:00 |
|
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 |
|
kiwedespars
|
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 |
|
keronshb
|
518c54c061
|
Adds the correct hijack
|
2021-09-16 15:52:53 -04:00 |
|