keronshb
|
a6bfff92cc
|
Fixes pirates, re adds extended, re adds voting
|
2021-09-24 19:40:56 -04:00 |
|
keronshb
|
cbe221e18f
|
Adds more blackbox stuff
|
2021-09-23 19:57:51 -04:00 |
|
keronshb
|
c9697f4bbf
|
Fixes dynamic
|
2021-09-23 19:38:15 -04:00 |
|
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 |
|
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 |
|
CitadelStationBot
|
433a92908e
|
Automatic changelog generation for PR #14219 [ci skip]
|
2021-09-19 16:54:39 -05:00 |
|
silicons
|
e06926899d
|
Merge pull request #14219 from zeroisthebiggay/ninjasarecum
[DONE basically] ports TG ninja rework plus tons of stuff
|
2021-09-19 14:54:37 -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 |
|
zeroisthebiggay
|
03704c054a
|
Update tgstation.dme
|
2021-09-19 15:31:34 -04:00 |
|
zeroisthebiggay
|
e5b2ab19c0
|
Update tgstation.dme
|
2021-09-19 15:27:51 -04:00 |
|
zeroisthebiggay
|
d6516d25de
|
Update tgstation.dme
|
2021-09-19 15:27:23 -04:00 |
|
zerothebigboy
|
ce43b1b49e
|
Merge branch 'ninjasarecum' of https://github.com/zeroisthebiggay/Citadel-Station-13 into ninjasarecum
# Conflicts:
# tgstation.dme
|
2021-09-19 15:25:42 -04: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 |
|
CitadelStationBot
|
5aea7175ea
|
Automatic changelog generation for PR #15074 [ci skip]
|
2021-09-19 13:12:05 -05: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 |
|
CitadelStationBot
|
eff5f97020
|
Automatic changelog generation for PR #15174 [ci skip]
|
2021-09-19 13:10:47 -05:00 |
|
silicons
|
f48bf3cdc0
|
Merge pull request #15174 from buffyuwu/holoparasites
probably fixes holoparasites
|
2021-09-19 11:10:45 -07:00 |
|
CitadelStationBot
|
88428d248b
|
Automatic changelog generation for PR #15133 [ci skip]
|
2021-09-19 13:10:31 -05:00 |
|
silicons
|
2c8d362dd5
|
Merge pull request #15133 from zeroisthebiggay/patch-21
the timeframely tips update
|
2021-09-19 11:10:28 -07:00 |
|
CitadelStationBot
|
da2ca355f1
|
Automatic changelog generation for PR #15094 [ci skip]
|
2021-09-19 13:09:57 -05:00 |
|
silicons
|
8d914571e8
|
Merge pull request #15094 from zeroisthebiggay/patch-20
removes building (fortnite) windows
|
2021-09-19 11:09:55 -07:00 |
|
CitadelStationBot
|
608cb77919
|
Automatic changelog generation for PR #15176 [ci skip]
|
2021-09-19 13:09:09 -05:00 |
|
silicons
|
a40acd3cd6
|
Merge pull request #15176 from buffyuwu/dogborgsleeper
fixes dogborg sleepers not working
|
2021-09-19 11:09:06 -07:00 |
|
CitadelStationBot
|
20feb1b3aa
|
Automatic changelog generation for PR #15178 [ci skip]
|
2021-09-19 13:09:03 -05: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 |
|
CitadelStationBot
|
e4f610b1e8
|
Automatic changelog generation for PR #15171 [ci skip]
|
2021-09-19 13:08:48 -05: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 |
|
CitadelStationBot
|
c40215437e
|
Automatic changelog generation for PR #15169 [ci skip]
|
2021-09-19 13:08:42 -05:00 |
|
silicons
|
a6637584a7
|
Merge pull request #15169 from timothyteakettle/REDACTED
adds a new mild trauma
|
2021-09-19 11:08:40 -07:00 |
|
zeroisthebiggay
|
86c8129935
|
Update sillytips.txt
|
2021-09-19 14:08:32 -04:00 |
|
CitadelStationBot
|
dfe311aa80
|
Automatic changelog generation for PR #15168 [ci skip]
|
2021-09-19 13:08:20 -05:00 |
|
silicons
|
516f5ba81f
|
Merge pull request #15168 from dapnee/map-fixies
Pubby and Beach Away Fixes
|
2021-09-19 11:08:17 -07:00 |
|
CitadelStationBot
|
5b735ea70f
|
Automatic changelog generation for PR #15167 [ci skip]
|
2021-09-19 13:08:12 -05: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 |
|
CitadelStationBot
|
74c732122c
|
Automatic changelog generation for PR #15163 [ci skip]
|
2021-09-19 13:07:34 -05:00 |
|
silicons
|
abb89d9af0
|
Merge pull request #15163 from buffyuwu/clothing
saltpr adding more suit slot clothing
|
2021-09-19 11:07:32 -07:00 |
|
CitadelStationBot
|
2f5d31409b
|
Automatic changelog generation for PR #15156 [ci skip]
|
2021-09-19 13:07:26 -05:00 |
|
silicons
|
946e718429
|
Merge pull request #15156 from zeroisthebiggay/canwepretendthattheairplanesinthenightskyareshootingstars
fixes madness mask sprites
|
2021-09-19 11:07:24 -07:00 |
|
CitadelStationBot
|
99216a653a
|
Automatic changelog generation for PR #15157 [ci skip]
|
2021-09-19 13:07:15 -05: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
|
1c22d85061
|
Merge pull request #15158 from SandPoot/obscured-slots
Adds obscured slots and TRAIT_NODROP checks to the outline system
|
2021-09-19 11:07:08 -07:00 |
|
CitadelStationBot
|
e51d767c43
|
Automatic changelog generation for PR #15160 [ci skip]
|
2021-09-19 13:07:04 -05:00 |
|