Commit Graph

22570 Commits

Author SHA1 Message Date
lolman360 e0dbfbd88c bhjin said i don't NEED muzzle sprites so fuck it 2019-08-15 09:47:55 +10:00
lolman360 ccb2d91c90 Update hats.dmi 2019-08-11 15:17:46 +10:00
lolman360 06bd8b8f20 Create hats.dmi 2019-08-11 15:14:49 +10:00
lolman360 b8a90fb742 Delete hats.dmi 2019-08-11 15:12:11 +10:00
lolman360 02ea161b2a hmm today i will undocument changes 2019-08-11 14:59:48 +10:00
lolman360 b283a0979c yay 2019-08-11 14:56:42 +10:00
lolman360 e2e7133eba ew things are called different things 2019-08-11 14:54:17 +10:00
lolman360 8e90a65cfa Add files via upload 2019-08-11 14:50:56 +10:00
lolman360 22b461c78f Merge pull request #1 from lolman360/master
d
2019-08-11 12:00:55 +10:00
lolman360 400c117fd0 yeetus those dmis my man 2019-08-11 11:56:48 +10:00
lolman360 5d78cf394b yeet those files up to the hub of git 2019-08-11 11:56:20 +10:00
lolman360 0451390778 control click and then drag is easy 2019-08-11 11:16:19 +10:00
lolman360 ffad3cfe22 so i should really not have access to github but 2019-08-11 11:14:47 +10:00
lolman360 e4a9f2743b and gitbabby 2019-08-11 11:14:07 +10:00
lolman360 aa71a39fa8 so basically im monky 2019-08-11 11:13:38 +10:00
lolman360 2c1add5276 all my other comimits were to master 2019-08-11 11:13:02 +10:00
lolman360 da61b66f5c ban me? 2019-08-11 11:11:30 +10:00
lolman360 92c7ae8732 yea i use webgit what ya gonna do 2019-08-11 11:07:17 +10:00
lolman360 f131104a73 Add files via upload 2019-08-11 10:51:38 +10:00
lolman360 8d7f4a1385 duira 2019-08-10 21:43:28 +10:00
CitadelStationBot c200c5eeec Automatic changelog generation for PR #9078 [ci skip] 2019-08-10 00:22:31 -05:00
kevinz000 40b89f49cc Merge pull request #9078 from kappa-sama/moth1
Changes teleporter machines to apply flyperson (more) equally
2019-08-09 22:22:29 -07:00
CitadelStationBot 74b6bc79fd Automatic changelog generation for PR #9064 [ci skip] 2019-08-10 00:20:20 -05:00
kevinz000 b3b22029a6 Merge pull request #9064 from cebutris/hugloves
Hugs of the North Star
2019-08-09 22:20:18 -07:00
CitadelStationBot af73ee78b1 Automatic changelog generation for PR #9070 [ci skip] 2019-08-10 00:18:42 -05:00
kevinz000 8cdb33c3a2 Merge pull request #9070 from Linzolle/rainbow-knife
adds rainbow knife inhands icon, also normalises knife colour
2019-08-09 22:18:40 -07:00
kevinz000 74008beb8f Merge pull request #9066 from Ghommie/Ghommie-cit181
Two lines fixes for invisible zipties and borked legcuffs.
2019-08-09 22:17:31 -07:00
CitadelStationBot 2aad4f28e2 Automatic changelog generation for PR #9083 [ci skip] 2019-08-10 00:16:36 -05:00
kevinz000 f516fcf539 Merge pull request #9083 from Trilbyspaceclone/fruit
Strawbarries, and more
2019-08-09 22:16:34 -07:00
CitadelStationBot 86b0819994 Automatic changelog generation for PR #9084 [ci skip] 2019-08-10 00:16:11 -05:00
kevinz000 b213b0ed2b Merge pull request #9084 from Ghommie/Ghommie-cit185
Fixes clock cult mass recall.
2019-08-09 22:16:09 -07:00
CitadelStationBot 4dda79cde2 Automatic changelog generation for PR #9085 [ci skip] 2019-08-10 00:15:58 -05:00
kevinz000 14033d9876 Merge pull request #9085 from Ghommie/Ghommie-cit186
underwear colors fix 2: The revenge of the crunch.
2019-08-09 22:15:55 -07:00
CitadelStationBot b1df6c1c07 Automatic changelog generation for PR #9081 [ci skip] 2019-08-09 13:20:19 -05:00
kevinz000 0329a80086 Merge pull request #9081 from BurgerLUA/Meteor-Fair-Warning
Central Command informs you when a Meteor Storm is about to hit 5 to 10 minutes before it happens
2019-08-09 11:20:16 -07:00
Ghommie ee57720ee3 underwear colors fix 2: The revenge of the crunch. 2019-08-09 05:11:12 +02:00
Ghommie eb3ae1d61a Fixes clock cult mass recall. 2019-08-09 04:05:06 +02:00
kappa-sama a8e4ce1f77 Merge branch 'master' into moth1 2019-08-08 18:27:34 -04:00
TrilbySpaceClone 5bd6f88226 Falsehoods 2019-08-08 18:27:01 -04:00
kappa-sama 1853dc185c Merge pull request #1 from Ghommie/Ghommie-cit185
Uncalibrated teleporters can now turn furries, scalies & co into flypeople.
2019-08-08 18:25:24 -04:00
TrilbySpaceClone 893c9c9c63 A correction? 2019-08-08 17:45:58 -04:00
Ghommie a7287ed4d1 Merge branch 'moth1' of https://github.com/kappa-sama/Citadel-Station-13 into Ghommie-cit185 2019-08-08 23:11:58 +02:00
TrilbySpaceClone ab13b62bdd fruits of labor 2019-08-08 16:14:04 -04:00
Ghommie a9eeb28fff Uncalibrated teleporters can now turn furries, scalies & co into flypeople too. 2019-08-08 21:09:11 +02:00
kappa-sama 2dc15b3fc0 Update teleporter.dm 2019-08-08 15:05:48 -04:00
kevinz000 ce064522fe Merge pull request #9076 from BurgerLUA/Proper-Fix
Fixes end of round voting unintentionally showing map votes and not gamemode votes
2019-08-08 11:25:02 -07:00
BurgerLua 9566caa527 Added 2019-08-08 09:25:04 -07:00
CitadelStationBot c6562164f1 Automatic changelog generation for PR #9071 [ci skip] 2019-08-08 04:00:40 -05:00
kevinz000 290dfb8bbd Merge pull request #9071 from YakumoChen/cloningnerf
Nerfs Autocloning
2019-08-08 02:00:37 -07:00
CitadelStationBot 1d663d69bc Automatic changelog generation for PR #9061 [ci skip] 2019-08-08 03:59:53 -05:00