Commit Graph

41056 Commits

Author SHA1 Message Date
CitadelStationBot
ddacd75efe Automatic changelog generation for PR #14132 [ci skip] 2021-02-04 13:45:14 -06:00
silicons
bec5d6d8a3 Merge pull request #14132 from shellspeed1/salt-nerf-romerol
MASSIVE SALT NERF
2021-02-04 12:45:11 -07:00
Changelogs
1f00b6fab2 Automatic changelog compile [ci skip] 2021-02-03 00:14:12 +00:00
CitadelStationBot
21ccfcff5c Automatic changelog generation for PR #14184 [ci skip] 2021-02-01 20:13:32 -06:00
Lin
5c626c739c Merge pull request #14184 from Hatterhat/green-saber-fix
oops/speedmerge pls - fixes green esaber forward facing sprite
2021-02-01 20:13:28 -06:00
Changelogs
f4128a4e9d Automatic changelog compile [ci skip] 2021-02-02 00:18:31 +00:00
CitadelStationBot
3a259c0ea9 Automatic changelog generation for PR #13895 [ci skip] 2021-01-31 23:35:40 -06:00
Lin
2d3627b75c Merge pull request #13895 from Citadel-Station-13/silicons-patch-53
Restores speedup to meth and nuka cola
2021-01-31 23:35:37 -06:00
Lin
1d275656b5 Merge pull request #14081 from Citadel-Station-13/silicons-patch-22
makes paraplegic spawn effects yield for calling function which MIGHT fix not spawning in with a wheelchair maybe(?)
2021-01-31 23:34:20 -06:00
CitadelStationBot
237c33940b Automatic changelog generation for PR #14113 [ci skip] 2021-01-31 23:34:03 -06:00
Lin
0dd82df64b Merge pull request #14113 from silicons/piggybacking
fixes piggybacking initial offsets. Also, adds the ability to carry around pAIs, because this totally won't result in more metaclique drama.
2021-01-31 23:33:59 -06:00
Hatterhat
7c50b45e0d oops 2021-01-31 19:53:58 -06:00
Changelogs
d41acaeb96 Automatic changelog compile [ci skip] 2021-01-31 00:18:10 +00:00
DeltaFire
6804d79aff Merge pull request #14167 from Citadel-Station-13/silicons-patch-6
eye lighting is no longer able to be clicked or realistically interacted with
2021-01-30 19:13:40 +01:00
DeltaFire
c417d576ec Merge pull request #14152 from Arturlang/turret_fixing_redo
Brings back turret fixing
2021-01-30 19:10:10 +01:00
CitadelStationBot
1acebf09ee Automatic changelog generation for PR #14031 [ci skip] 2021-01-30 11:44:23 -06:00
DeltaFire
ee7c45fe77 Merge pull request #14031 from Putnam3145/fermi-emp-fix
Fixes fermichem EMPs being massive.
2021-01-30 18:44:20 +01:00
shellspeed1
78651f00e3 Update uplink_stealth.dm 2021-01-30 01:27:22 -08:00
silicons
5037216f5a Update eyes.dm 2021-01-29 22:16:14 -07:00
Changelogs
512124100e Automatic changelog compile [ci skip] 2021-01-30 00:17:02 +00:00
silicons
c554f0567e Update human.dm 2021-01-29 11:57:28 -07:00
CitadelStationBot
c8dc669e58 Automatic changelog generation for PR #14149 [ci skip] 2021-01-29 08:30:16 -06:00
silicons
7c535fb503 Merge pull request #14149 from timothyteakettle/caw-and-gekker
adds 'clucks', 'caws' and 'gekkers' to the speech verb list
2021-01-29 07:30:13 -07:00
CitadelStationBot
a34378cd43 Automatic changelog generation for PR #14156 [ci skip] 2021-01-29 08:29:49 -06:00
silicons
540b8c280b Merge pull request #14156 from zeroisthebiggay/cooming
hair ports part two | now featuring skrell hair
2021-01-29 07:29:46 -07:00
silicons
e417d72703 Merge pull request #14150 from zeroisthebiggay/ohgodohfuck
a zero pr that didn't need a followup pr to fix bugs doesn't exist | adds the multicolor berets to loadout
2021-01-29 07:29:39 -07:00
CitadelStationBot
46619cf0f8 Automatic changelog generation for PR #14148 [ci skip] 2021-01-29 08:29:31 -06:00
silicons
1974f2b41d Merge pull request #14148 from zeroisthebiggay/whytho
gives the advanced extinguisher a sprite that doesn't look like total dogshit even by codersprite standards
2021-01-29 07:29:28 -07:00
zeroisthebiggay
90bd136dad Update modular_citadel/code/modules/client/loadout/head.dm
Co-authored-by: Hatterhat <31829017+Hatterhat@users.noreply.github.com>
2021-01-29 07:38:37 -05:00
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
zerothebigboy
0bc3c5292c arooga 2021-01-28 12:31:23 -05:00
Timothy Teakettle
938b924a37 yes 2021-01-28 11:12:27 +00:00
Artur
f2343b32fe Brings back turret fixing 2021-01-28 09:39:21 +02: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
zerothebigboy
c6420ae433 fuck 2021-01-27 22:59:44 -05:00
silicons
fa2754c0fe Update human.dm 2021-01-27 20:49:56 -07:00
silicons
1c99225fbd Update human.dm 2021-01-27 20:48:07 -07: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
Timothy Teakettle
a7445316ef Update flavor_misc.dm 2021-01-28 02:11:08 +00:00
Timothy Teakettle
337611a372 Merge remote-tracking branch 'upstream/master' into caw-and-gekker 2021-01-28 02:10:11 +00: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