Commit Graph

41003 Commits

Author SHA1 Message Date
Changelogs
4d945d5f15 Automatic changelog compile [ci skip] 2021-01-29 00:18:12 +00:00
silicons
4e446bf894 Merge pull request #14154 from timothyteakettle/stop-encoding-twice
i broke adminpms and this fixes them sorry
2021-01-28 16:49:51 -07:00
CitadelStationBot
029359d3dc Automatic changelog generation for PR #14157 [ci skip] 2021-01-28 14:16:30 -06:00
silicons
a402c20859 Merge pull request #14157 from MrJWhit/boxstation-air-alarm-fix
Gee kevin, why does atmos get /two/ air alarms?
2021-01-28 13:16:26 -07:00
MrJWhit
ce675498f4 Gee kevin, why does atmos get /two/ air alarms? 2021-01-28 14:22:01 -05:00
Timothy Teakettle
938b924a37 yes 2021-01-28 11:12:27 +00:00
CitadelStationBot
b7001453a3 Automatic changelog generation for PR #14151 [ci skip] 2021-01-27 22:21:50 -06:00
silicons
520e430889 Merge pull request #14151 from MrJWhit/cloak-pr,-no-actually-final,-I'm-done-othterwise
Final, final, final cloak PR, now conflict free
2021-01-27 21:21:47 -07:00
MrJWhit
5a75028889 neck 2021-01-27 23:17:36 -05:00
CitadelStationBot
b2f369a537 Automatic changelog generation for PR #14067 [ci skip] 2021-01-27 20:11:22 -06:00
silicons
34cb148232 Merge pull request #14067 from TripleShades/box-chapel
Box Chapel Redecoration [updated]
2021-01-27 19:11:20 -07:00
CitadelStationBot
58304da402 Automatic changelog generation for PR #14093 [ci skip] 2021-01-27 20:09:44 -06:00
silicons
1d72a574b2 Merge pull request #14093 from timothyteakettle/rename-redescribe-loadout
loadout part 3: custom names and descriptions
2021-01-27 19:09:41 -07:00
silicons
a973a3b088 Merge pull request #14145 from zeroisthebiggay/aeughfuck
ports some hairstyles from rp because god knows we need some good hairs that aren't Short Hair 3 and Wisp
2021-01-27 19:08:25 -07:00
CitadelStationBot
052edc474b Automatic changelog generation for PR #14146 [ci skip] 2021-01-27 20:08:21 -06:00
silicons
912b09d33b Merge pull request #14146 from zeroisthebiggay/ooffuck
RP ports featuring accessories, small code fixes, shibari ropes, stockings, and celebrating 2021's animal or whatever
2021-01-27 19:08:19 -07:00
CitadelStationBot
ce616c55c9 Automatic changelog generation for PR #14147 [ci skip] 2021-01-27 20:08:03 -06:00
silicons
af3b237846 Merge pull request #14147 from timothyteakettle/fix-miner-bedsheet
fixes miner bedsheet
2021-01-27 19:08:00 -07:00
CitadelStationBot
f721248011 Automatic changelog generation for PR #14142 [ci skip] 2021-01-27 20:07:48 -06:00
silicons
f623dde8df Merge pull request #14142 from zeroisthebiggay/sexmask
adds aesthetic sterile masks (and the paper mask) to the loadout panel
2021-01-27 19:07:45 -07:00
Changelogs
69673e7aa0 Automatic changelog compile [ci skip] 2021-01-28 00:18:29 +00:00
CitadelStationBot
e3fb2edd13 Automatic changelog generation for PR #14086 [ci skip] 2021-01-27 17:18:32 -06:00
Lin
b1b5adb90d Merge pull request #14086 from Citadel-Station-13/silicons-patch-25
officially adds the functionality to insert holdable mobs into colormate
2021-01-27 17:18:29 -06:00
CitadelStationBot
08b2c365f5 Automatic changelog generation for PR #14112 [ci skip] 2021-01-27 17:16:48 -06:00
Lin
f7c1cdc571 Merge pull request #14112 from silicons/ex_act_3
~~hugboxes~~ fixes the bug (that was probably my fault) that makes 1 dev explosions ALWAYS delete brain
2021-01-27 17:16:44 -06:00
Lin
4e3a4a30c3 Merge pull request #14139 from Citadel-Station-13/silicons-patch-2
small refactor to pinpointers, allow pinpointers with custom targets
2021-01-27 17:16:09 -06:00
zerothebigboy
ee74f2c06c here comes fetish content 2021-01-27 15:38:34 -05:00
Timothy Teakettle
6d6b232afe i hate shitcoders 2021-01-27 20:33:14 +00:00
zerothebigboy
f3072433ff thankyoubasedrp 2021-01-27 14:56:26 -05:00
zerothebigboy
ad2864f137 aeughfuck 2021-01-27 13:30:44 -05:00
Putnam3145
2765aed0b4 Merge pull request #14085 from Citadel-Station-13/silicons-patch-24
ok as funny as this is, painting pets in gear painters is the result of a potentially awful bug regarding mob holder drop logic
2021-01-26 22:24:57 -08:00
Putnam3145
8b9551b39c Merge pull request #14056 from Citadel-Station-13/silicons-patch-14
disables rotatium due to it being horifically bugged and unmaintained
2021-01-26 22:24:14 -08:00
Changelogs
4a8ccbe031 Automatic changelog compile [ci skip] 2021-01-27 00:16:29 +00:00
zeroisthebiggay
4b6f0d3ffa Update mask.dm 2021-01-26 14:11:00 -05:00
zeroisthebiggay
0bc8c9383c Update miscellaneous.dm 2021-01-26 13:17:44 -05:00
zerothebigboy
7b2a6955cc please 2021-01-26 13:13:09 -05:00
silicons
0a5ad34fd6 Update pinpointer.dm 2021-01-26 07:26:59 -07:00
silicons
93ff29a579 Update pinpointer.dm 2021-01-26 00:00:39 -07:00
CitadelStationBot
b711259762 Automatic changelog generation for PR #14118 [ci skip] 2021-01-26 00:17:43 -06:00
silicons
efc3ecef32 Merge pull request #14118 from DeltaFire15/slabs-and-silicons
About ratvarian borgs and spells sometimes not working (+ a few other small things)
2021-01-25 23:17:41 -07:00
CitadelStationBot
d2234dc6d8 Automatic changelog generation for PR #14102 [ci skip] 2021-01-26 00:17:32 -06:00
silicons
a1e92e55aa Merge pull request #14102 from Hatterhat/somatobuff-50513
[READY] somatoray buff - mutation locks + revolution ray
2021-01-25 23:17:29 -07:00
CitadelStationBot
93738b7cbd Automatic changelog generation for PR #14111 [ci skip] 2021-01-26 00:17:12 -06:00
silicons
6a2ae34ebe Merge pull request #14111 from Arturlang/revenant_TK
[READY]Gives the revenant TK
2021-01-25 23:17:09 -07:00
CitadelStationBot
323efeb06f Automatic changelog generation for PR #14127 [ci skip] 2021-01-26 00:04:05 -06:00
silicons
0c6e67ac81 Merge pull request #14127 from Hatterhat/tg-56348
tgstation#56348 - contractor TC buff
2021-01-25 23:04:01 -07:00
CitadelStationBot
fd52c5b512 Automatic changelog generation for PR #14131 [ci skip] 2021-01-26 00:03:58 -06:00
silicons
b746386046 Merge pull request #14131 from MrJWhit/air-alarm-fixes
Mass air alarm fixings for (basically) every station
2021-01-25 23:03:55 -07:00
CitadelStationBot
426a2446c4 Automatic changelog generation for PR #14133 [ci skip] 2021-01-26 00:02:14 -06:00
silicons
b77cc68e8d Merge pull request #14133 from Hatterhat/depcards-nobody-asked-for
department budget cards but not in lockers
2021-01-25 23:02:11 -07:00