Commit Graph

30819 Commits

Author SHA1 Message Date
Ghom 213a406568 Merge pull request #11167 from Citadel-Station-13/kevinz000-patch-11
hand teles uses a (slightly) less atrocious sprite for the beam
2020-02-24 16:40:17 +01:00
CitadelStationBot 645da9010a Automatic changelog generation for PR #11110 [ci skip] 2020-02-24 09:39:19 -06:00
Ghom 9355e9319b Merge pull request #11110 from Hatterhat/hyper-96-aus-unk
you kids like extend votes?
2020-02-24 16:39:16 +01:00
CitadelStationBot 6b43ca03da Automatic changelog generation for PR #11201 [ci skip] 2020-02-24 03:33:56 -06:00
kevinz000 8cf41997f5 Merge pull request #11201 from Hatterhat/bows
really just a lot of shit about bows
2020-02-24 02:33:54 -07:00
kevinz000 0cfa6699b1 yeah ok fine 2020-02-24 02:31:14 -07:00
kevinz000 43c17b4ab3 Merge pull request #11180 from Detective-Google/psych+paramedic
Adds epic and also cool paramedics [lazy tg port]
2020-02-24 02:30:36 -07:00
Detective-Google 0caed52ca5 removes the epic and cool access and makes it less epic and more cool 2020-02-24 03:28:33 -06:00
CitadelStationBot fc3ca40b06 Automatic changelog generation for PR #11216 [ci skip] 2020-02-24 03:27:29 -06:00
kevinz000 3e77952652 Merge pull request #11216 from Putnam3145/rename-logging
[S] Adds rename logging
2020-02-24 02:27:27 -07:00
CitadelStationBot 14565025fa Automatic changelog generation for PR #11183 [ci skip] 2020-02-24 03:27:08 -06:00
kevinz000 59074d1174 Merge pull request #11183 from Trilbyspaceclone/patch-291
Removes more Trek armor.
2020-02-24 02:27:05 -07:00
CitadelStationBot 9a9558f95f Automatic changelog generation for PR #11188 [ci skip] 2020-02-24 03:24:22 -06:00
kevinz000 6dcbf4df6f Merge pull request #11188 from Trilbyspaceclone/more_sweets
The plywood chair sprites now looks better
2020-02-24 02:24:19 -07:00
CitadelStationBot 1c8afe1a5b Automatic changelog generation for PR #11185 [ci skip] 2020-02-24 03:24:08 -06:00
kevinz000 4fc0ef5e74 Merge pull request #11185 from Trilbyspaceclone/J.A.S.O.N
Makes all IPC organs look robotic!
2020-02-24 02:24:06 -07:00
CitadelStationBot 592c3fb843 Automatic changelog generation for PR #11184 [ci skip] 2020-02-24 03:23:47 -06:00
kevinz000 493d62c17e Merge pull request #11184 from Trilbyspaceclone/patch-292
Remember when Kev made IPCs hearts no longer emp? Me ether!
2020-02-24 02:23:45 -07:00
CitadelStationBot f7d8f8f59b Automatic changelog generation for PR #11214 [ci skip] 2020-02-24 03:23:32 -06:00
kevinz000 ae6c388510 Merge pull request #11214 from Citadel-Station-13/Ghommie-patch-3
Fixing pAI radios inability to be toggled on/off
2020-02-24 02:23:30 -07:00
CitadelStationBot 76542208a6 Automatic changelog generation for PR #11199 [ci skip] 2020-02-24 03:23:20 -06:00
kevinz000 73c03adbbb Merge pull request #11199 from Detective-Google/pai.pai.pai.png
Lets pAIs hold encryption keys and play music.
2020-02-24 02:23:17 -07:00
Putnam f7e0eb43f8 Adds rename logging 2020-02-23 22:53:20 -08:00
Hatterhat 19ae30ea5b alright ghom i hope this works
Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>
2020-02-23 21:20:57 -06:00
CitadelStationBot 5037f28eaf Automatic changelog generation for PR #11162 [ci skip] 2020-02-23 15:48:10 -06:00
Ghom 565fa77cf9 Merge pull request #11162 from Hatterhat/quickpatch-enzyme
biogen enzyme fix, multitool basic tools node fix
2020-02-23 22:48:07 +01:00
CitadelStationBot 6dce641061 Automatic changelog generation for PR #11187 [ci skip] 2020-02-23 15:47:39 -06:00
Ghom f5dbb0b20d Merge pull request #11187 from Trilbyspaceclone/sweet
New bar sign, The Hive
2020-02-23 22:47:37 +01:00
Ghom 3e232f93d9 Update barsigns.dm 2020-02-23 22:47:21 +01:00
Ghom 825beb41c1 Update paicard.dm 2020-02-23 22:44:38 +01:00
Ghom 112c203216 Merge pull request #11213 from Hatterhat/combifans
combifan fix please speedmerge
2020-02-23 21:35:15 +01:00
Ghom b3149d930f Fixing pAI radios inability to be toggled on/off 2020-02-23 21:31:53 +01:00
Hatterhat 31a93d9f32 you'd think i'd have remembered to change paths 2020-02-23 14:27:40 -06:00
Hatterhat 094b92e58b silk, time, rods 2020-02-23 13:12:25 -06:00
kevinz000 ae42db8674 Merge pull request #11210 from Ghommie/Ghommie-cit588
[s] Fixing an issue with slot machines crashing the server.
2020-02-23 06:02:13 -07:00
Ghom 485241a361 cleanup detail 2020-02-23 13:32:46 +01:00
CitadelStationBot 9085c9865b Automatic changelog generation for PR #11206 [ci skip] 2020-02-23 06:30:25 -06:00
Ghom 2075147ee9 Merge pull request #11206 from Trilbyspaceclone/patch-294
Corn dogs now have a sprite
2020-02-23 13:30:23 +01:00
Ghommie 0d67e81ad5 Yo. 2020-02-23 13:18:16 +01:00
Ghommie 2b740f9bad [s] Fixing an issue with slot machines crashing the server. 2020-02-23 13:09:21 +01:00
CitadelStationBot fd5051361e Automatic changelog generation for PR #11207 [ci skip] 2020-02-23 05:37:20 -06:00
Ghom b4bca3663c Merge pull request #11207 from Trilbyspaceclone/patch-295
[s] Fixes sand crafting
2020-02-23 12:37:17 +01:00
TrilbySpaceClone 845e719ade But what if we did it right? 2020-02-23 01:52:36 -05:00
Trilbyspaceclone 2dea3cf15c Gives ash sandstone 2020-02-23 00:53:42 -05:00
Trilbyspaceclone 342f1cd4c1 Update snacks_meat.dm 2020-02-22 23:17:30 -05:00
Hatterhat ba81184fef Merge branch 'master' into quickpatch-enzyme 2020-02-22 18:06:17 -06:00
TrilbySpaceClone aeacb06dfc charrrries 2020-02-22 18:21:47 -05:00
TrilbySpaceClone 27655cd760 Merge branch 'master' into more_sweets 2020-02-22 18:20:39 -05:00
Hatterhat b89a2314a2 mmm that's compiling i don't like that 2020-02-22 16:17:51 -06:00
CitadelStationBot 214cd92fef Automatic changelog generation for PR #11179 [ci skip] 2020-02-22 15:49:11 -06:00