shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
41,023 Commits 5 Branches 0 Tags
17e8e72df29def8a01ff4c261fb54cc8fc16bd29
Commit Graph

41023 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
CitadelStationBot 052edc474b Automatic changelog generation for PR #14146 [ci skip] 2021-01-27 20:08:21 -06:00
Timothy Teakettle e130e9c7e2 Update flavor_misc.dm 2021-01-28 02:08:19 +00: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
zerothebigboy e7d8021b81 a 2021-01-27 18:46:11 -05: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