Commit Graph

41041 Commits

Author SHA1 Message Date
SmArtKar c9e97986c8 Patches, fixes, NUCLEAR CARDS 2021-02-05 12:13:38 +03:00
SmArtKar 1b4072a1b6 Well, reverts illegal cards not saving. Fuck it 2021-02-04 22:36:46 +03:00
SmArtKar 6c92e99899 desc 2021-02-04 22:13:59 +03:00
SmArtKar dedb2d2c6c CI again... 2021-02-04 22:13:23 +03:00
SmArtKar 3386511150 shiet 2021-02-04 21:57:07 +03:00
SmArtKar 24619344f5 Traitor/nuke ops cards no longer count as real cards in binders(they are cheap knock-offs like come on nobody will believe that its a real card) 2021-02-04 19:08:35 +03:00
SmArtKar 2135a391dc More cards? More cards! 2021-02-04 19:03:03 +03:00
SmArtKar 2cd339f776 Adds Card Ops bundle 2021-02-04 18:57:00 +03:00
SmArtKar c202914b65 FUUUUUUUUUUUUCK YOUUUUUU 2021-02-04 17:50:56 +03:00
SmArtKar 9d82e18308 Removal of junk 2 2021-02-04 17:36:10 +03:00
SmArtKar 7a5ee6f668 Removal of junk 2021-02-04 17:35:27 +03:00
SmArtKar a8fa3ba4e1 fucked up 2021-02-04 17:28:10 +03:00
SmArtKar a6376fbf3d slight balance 2021-02-04 17:27:48 +03:00
SmArtKar 348f57968f Adds unique ruin cards and Exodia cards) 2021-02-04 16:42:55 +03:00
SmArtKar 41d6ab6b07 REEEEEEEEEE 2021-02-03 16:50:23 +03:00
SmArtKar 5c3d134e6e Actually adds binders as well 2021-02-03 16:46:08 +03:00
SmArtKar b0c63ea547 Fuck you and your persistence system 2021-02-03 16:43:05 +03:00
SmArtKar 76831f27fb I WANT TO RIP WHOEVER CODED THIS FUCKING CI 2021-02-02 18:32:13 +03:00
SmArtKar 17e8e72df2 Fuck this shit I am out 2021-02-02 16:28:42 +03:00
SmArtKar c54a408d81 Fuck you CI 2021-02-02 16:24:43 +03:00
SmArtKar f554b92702 Centcom fix 2 2021-02-02 16:16:19 +03:00
SmArtKar 1e8203e9c7 Centcom fix 2021-02-02 16:10:17 +03:00
SmArtKar 7b2e1ef44f TCG! 2021-02-02 14:40:29 +03:00
Changelogs 512124100e Automatic changelog compile [ci skip] 2021-01-30 00:17:02 +00: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
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
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