Commit Graph
31500 Commits
Author SHA1 Message Date
Ghommie ad4d290ea7 WIP 2020-03-08 19:26:01 +01:00
CitadelStationBot d78926b269 Automatic changelog generation for PR #11369 [ci skip] 2020-03-08 09:34:51 -05:00
kevinz000andGitHub c736568a5a Merge pull request #11369 from Ghommie/Ghommie-cit609
Porting the musician and curator beacons.
2020-03-08 07:34:48 -07:00
LinandGitHub ea1bb1812c Merge pull request #11370 from Citadel-Station-13/Ghommie-patch-1
Me 2048
2020-03-08 01:26:39 -06:00
CitadelStationBot d4e4f357d4 Automatic changelog generation for PR #11383 [ci skip] 2020-03-08 00:18:11 -06:00
GhomandGitHub 57db0e0320 Merge pull request #11383 from Putnam3145/fix-storyteller-weights
Gives storyteller weights defaults properly (whoops)
2020-03-08 07:18:09 +01:00
Putnam dfa7637f1b fixes storyteller weights 2020-03-07 22:09:20 -08:00
CitadelStationBot ecba3d0ebe Automatic changelog generation for PR #11368 [ci skip] 2020-03-07 22:33:23 -06:00
GhomandGitHub a41d1eaa8b Merge pull request #11368 from Putnam3145/eigenstasium-nope
Eigenstasium no longer encourages certain personalities
2020-03-08 05:33:20 +01:00
GhomandGitHub 525ac3a8fc Merge pull request #11344 from Citadel-Station-13/kevinz000-patch-11
vore bellies now clear owner.vore_selected on delete
2020-03-08 01:41:05 +01:00
GhomandGitHub b96475d5aa Merge pull request #11346 from Citadel-Station-13/kevinz000-patch-15
/carbons now null out hand_bodyparts on Destroy()
2020-03-08 01:40:43 +01:00
CitadelStationBot a3cc805d13 Automatic changelog generation for PR #11366 [ci skip] 2020-03-07 18:40:24 -06:00
GhomandGitHub 201a85464c Merge pull request #11366 from zeroisthebiggay/nerfsthekiloshuttle
kilo shuttle less eyesorey
2020-03-08 01:40:22 +01:00
CitadelStationBot 788660c822 Automatic changelog generation for PR #11353 [ci skip] 2020-03-07 18:40:09 -06:00
GhomandGitHub 1e0ea6facf Merge pull request #11353 from Citadel-Station-13/kevinz000-patch-22
Rebalances nanite adrenals
2020-03-08 01:40:07 +01:00
CitadelStationBot 8012eebfb8 Automatic changelog generation for PR #11360 [ci skip] 2020-03-07 18:39:55 -06:00
GhomandGitHub 3e9b998866 Merge pull request #11360 from Citadel-Station-13/kevinz000-patch-23
Stunbaton disarm mode also works on disarm intent now
2020-03-08 01:39:53 +01:00
CitadelStationBot be8331eeb4 Automatic changelog generation for PR #11363 [ci skip] 2020-03-07 18:39:43 -06:00
GhomandGitHub 64215b41a4 Merge pull request #11363 from Ragolution/took-it-and-threw-it-on-the-ground
Culls irrelevant targeting information on Drink Fling.
2020-03-08 01:39:41 +01:00
GhomandGitHub 40fd1deeeb Merge pull request #11364 from kevinz000/gc_debugging
Fixes more xenobio GC memes
2020-03-08 01:16:41 +01:00
LinandGitHub 1a36d6e6fa Merge pull request #10770 from Ghommie/Ghommie-cit536
Removes an unused file and another outdated one.
2020-03-07 17:59:12 -06:00
CitadelStationBot 81f2963a0d Automatic changelog generation for PR #11356 [ci skip] 2020-03-07 17:50:56 -06:00
LinandGitHub 3dfd7a5ea4 Merge pull request #11356 from Citadel-Station-13/kevinz000-patch-19
Nerfs ninja stungloves to match new batons
2020-03-07 17:50:54 -06:00
kevinz000andGitHub 7115c96f9d Merge branch 'master' into gc_debugging 2020-03-07 15:30:47 -08:00
CitadelStationBot c9cad7a0ff Automatic changelog generation for PR #11193 [ci skip] 2020-03-07 04:39:53 -06:00
GhomandGitHub f35dfeb472 Merge pull request #11193 from Trilbyspaceclone/patch-293
Makes two new legion drops
2020-03-07 11:39:51 +01:00
CitadelStationBot 02a32dc2bd Automatic changelog generation for PR #11339 [ci skip] 2020-03-07 04:39:02 -06:00
GhomandGitHub 6422b15430 Merge pull request #11339 from MrJWhit/teg-fix-so-fract-doesn't-yell
TEG fix so fract doesn't yell at me
2020-03-07 11:38:59 +01:00
GhomandGitHub 5fecf00621 Merge pull request #11361 from Ragolution/just-slide-on-in
Fixes bartender drink slide spill A
2020-03-07 11:37:41 +01:00
GhomandGitHub 213086ae9f Merge pull request #11345 from Citadel-Station-13/kevinz000-patch-12
VV now internally always uses \ref instead of REF()
2020-03-07 11:37:17 +01:00
GhomandGitHub aed0efb117 Merge pull request #11343 from Citadel-Station-13/kevinz000-patch-7
mobs now clear LAssailent and movespeed modification on Destroy() (alt name i hate xenobiology)
2020-03-07 11:36:37 +01:00
GhomandGitHub fdf3dc82e4 Merge pull request #11347 from Citadel-Station-13/kevinz000-patch-17
Makes xenobiology powergamers slightly less horrible for the server by caching slime mutation lists
2020-03-07 11:36:06 +01:00
CitadelStationBot dce540b4cf Automatic changelog generation for PR #11359 [ci skip] 2020-03-07 04:35:41 -06:00
GhomandGitHub 865e859141 Merge pull request #11359 from Trilbyspaceclone/lightswitch
Corrects snowcones
2020-03-07 11:35:39 +01:00
CitadelStationBot 1b926905fb Automatic changelog generation for PR #11338 [ci skip] 2020-03-07 04:27:00 -06:00
kevinz000andGitHub 5a18cac701 Merge pull request #11338 from Crystal9156/patch-1
Fixes Chocolate Jelly Donuts
2020-03-07 03:26:57 -07:00
CitadelStationBot cab5747acf Automatic changelog generation for PR #11340 [ci skip] 2020-03-07 04:26:51 -06:00
kevinz000andGitHub 02a488f507 Merge pull request #11340 from Ghommie/Ghommie-cit605
Porting movespeed modifiers code updates.
2020-03-07 03:26:48 -07:00
CitadelStationBot f58955b80a Automatic changelog generation for PR #11358 [ci skip] 2020-03-07 04:24:32 -06:00
kevinz000andGitHub 7de59975fc Merge pull request #11358 from bunny232/master
Box bar lightswitch/pipe fixes now with mapmerge
2020-03-07 03:24:29 -07:00
204311abad Update code/modules/mob/living/living.dm
Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>
2020-03-07 01:06:24 -07:00
9d1cef2e97 Update code/modules/reagents/reagent_containers.dm
Drink slide changes recommended by Ghom p.2

Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>
2020-03-07 01:58:17 -05:00
860d6b0827 Update code/modules/reagents/reagent_containers.dm
Drink slide changes recommended by Ghom p.1

Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>
2020-03-07 01:58:06 -05:00
Putnam ddd4d14477 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into eigenstasium-nope 2020-03-06 22:57:12 -08:00
GhomandGitHub 137e3560c5 Me 2048 2020-03-07 00:57:25 +01:00
GhomandGitHub 9066287037 Oh yea I forgot tg repathed many /under clothes a while ago. 2020-03-07 00:42:18 +01:00
Ghommie e3e15ea7a4 accidental revert. 2020-03-07 00:30:10 +01:00
CitadelStationBot 4dfa3ec3cf Automatic changelog generation for PR #11367 [ci skip] 2020-03-06 17:15:16 -06:00
GhomandGitHub 0e8d1041a4 Merge pull request #11367 from Trilbyspaceclone/patch-303
Corrects arrow crafting
2020-03-07 00:15:13 +01:00
Ghommie a817bd6115 Porting the musician and curator beacons. 2020-03-07 00:12:50 +01:00