Commit Graph

43855 Commits

Author SHA1 Message Date
SandPoot
6445cfdd9d Removes spontaneous vore and reorganizes buttons 2021-07-15 17:32:03 -03:00
SandPoot
3cf040bcdf Update VorePanel.js 2021-07-14 00:53:35 -03:00
SandPoot
3cb44d41a3 upload files 2021-07-14 00:35:30 -03:00
Changelogs
3a11960a35 Automatic changelog compile [ci skip] 2021-07-14 00:56:08 +00:00
SandPoot
ae23302ba9 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-07-13 15:52:45 -03:00
Lin
d50eb91632 Merge pull request #14921 from Putnam3145/componentize-acid
Componentizes acid
2021-07-13 11:52:43 -07:00
Lin
1bf06983dc Merge pull request #14938 from Putnam3145/hotspot-fix
Makes fire visuals respect hyper-nob
2021-07-13 11:39:36 -07:00
Changelogs
dcbecbaee6 Automatic changelog compile [ci skip] 2021-07-13 01:01:15 +00:00
Changelogs
101a512548 Automatic changelog compile [ci skip] 2021-07-13 00:23:43 +00:00
silicons
3fcf8dc78b Merge pull request #14935 from bunny232/metatestinglab
Meta station toxins
2021-07-12 12:32:02 -07:00
CitadelStationBot
98e9b32adc Automatic changelog generation for PR #14918 [ci skip] 2021-07-12 02:04:23 -05:00
Lin
97f8698f8a Merge pull request #14918 from MrJWhit/pubby-cap-mirror
Pubby mirror for the captains office
2021-07-12 00:04:21 -07:00
Lin
114df4e717 Merge pull request #14920 from Putnam3145/fix-activity-runtime-again
Fixes a runtime in activity tracking
2021-07-12 00:03:53 -07:00
Lin
daf837f89e Merge pull request #14924 from Citadel-Station-13/restraints
handcuffs now require you to stand still to break out of again. Buffs bolas and energy snares breakout time because I forgot to do that when I made you able to move while breaking out of it
2021-07-12 00:03:39 -07:00
Changelogs
9f98020bf8 Automatic changelog compile [ci skip] 2021-07-12 00:24:25 +00:00
CitadelStationBot
edf7ba17f4 Automatic changelog generation for PR #14922 [ci skip] 2021-07-11 12:27:33 -05:00
Lin
3b1bef2729 Merge pull request #14922 from Putnam3145/remove-dirt-buildup
Removes causes_dirt_buildup_on_floor and replaces it with just making humans do that in their Move
2021-07-11 10:27:31 -07:00
Putnam3145
70a5dd3693 yes 2021-07-10 22:53:14 -07:00
Changelogs
d267cedac2 Automatic changelog compile [ci skip] 2021-07-11 01:04:18 +00:00
Changelogs
7fc5aa9550 Automatic changelog compile [ci skip] 2021-07-11 00:23:07 +00:00
Putnam3145
cf9cb01f3a makes fire visuals respect hyper-nob 2021-07-10 14:26:48 -07:00
CitadelStationBot
fcb8eaf6cd Automatic changelog generation for PR #14936 [ci skip] 2021-07-10 14:06:28 -05:00
Lin
108c9dba9e Merge pull request #14936 from shellspeed1/woops
fixes to the new survival pod.
2021-07-10 12:06:26 -07:00
Changelogs
149c263ae5 Automatic changelog compile [ci skip] 2021-07-10 00:58:04 +00:00
Changelogs
d38280bd4a Automatic changelog compile [ci skip] 2021-07-10 00:23:25 +00:00
CitadelStationBot
c4d8805a9f Automatic changelog generation for PR #14842 [ci skip] 2021-07-09 18:50:02 -05:00
silicons
d0b3857cb6 Merge pull request #14842 from WanderingFox95/WanderingFox95-TheWheelchairPRs
[Ready] Wheelchair Sprite Rollback + Motorized Hoverchairs
2021-07-09 16:50:00 -07:00
shellspeed1
5eff532b03 Woops, lets fix that 2021-07-09 01:12:10 -07:00
Changelogs
eff610dd9b Automatic changelog compile [ci skip] 2021-07-09 00:25:19 +00:00
Lin
975846c7eb Merge pull request #14932 from MrJWhit/pubby-atmos-fixins
Makes it so AIs can plasmaflood in pubby
2021-07-08 17:11:15 -07:00
CitadelStationBot
3fd9449e57 Automatic changelog generation for PR #14929 [ci skip] 2021-07-08 14:16:29 -05:00
Lin
b152052c70 Merge pull request #14929 from MrJWhit/engine-map-fixes
Adds another wall to the AM engine
2021-07-08 12:16:27 -07:00
bunny232
6aebfb08fc Update MetaStation.dmm 2021-07-08 12:35:31 -04:00
CitadelStationBot
eb607f1e93 Automatic changelog generation for PR #14928 [ci skip] 2021-07-07 20:24:59 -05:00
Lin
4654af128b Merge pull request #14928 from MrJWhit/AAAAAAAAAAAAAAAAAAAH
AAAAAAAAAH
2021-07-07 18:24:57 -07:00
MrJWhit
9063ad262b Update PubbyStation.dmm 2021-07-07 16:21:40 -04:00
Changelogs
552d5e3c0b Automatic changelog compile [ci skip] 2021-07-07 01:01:09 +00:00
Changelogs
b20f2ab43d Automatic changelog compile [ci skip] 2021-07-07 00:25:44 +00:00
MrJWhit
26b186d24f Update engine_am.dmm 2021-07-06 16:29:45 -04:00
Lin
08e3a03c29 Merge pull request #14923 from Citadel-Station-13/silicons-patch-45
fixes handcuff resisting being instant
2021-07-06 12:04:39 -07:00
CitadelStationBot
b23b3e1637 Automatic changelog generation for PR #14927 [ci skip] 2021-07-06 13:53:12 -05:00
Lin
a771810c49 Merge pull request #14927 from DeltaFire15/species-aaaaa
Fixes golem / plasmaman species color
2021-07-06 11:53:09 -07:00
MrJWhit
3f5f639c42 Update PubbyStation.dmm 2021-07-06 01:45:44 -04:00
MrJWhit
e1f8b5ba55 AAAAAAAAAH 2021-07-06 01:34:15 -04:00
silicons
4bd054a7fd Merge pull request #14925 from LetterN/patch-8
funding button
2021-07-05 16:18:59 -07:00
DeltaFire
dd71d12359 aaaaaaaaa 2021-07-05 15:28:39 +02:00
SandPoot
f1de6dfe62 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-07-05 01:32:38 -03:00
Letter N
aaea168612 sponsor button
mmm mmone
2021-07-05 12:14:03 +08:00
silicons
18fb23bb1f Update carbon.dm 2021-07-04 18:19:31 -07:00
Changelogs
190fcaffa9 Automatic changelog compile [ci skip] 2021-07-05 00:57:35 +00:00