shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
32,518 Commits 5 Branches 0 Tags
4baaed19002ddff86cbc7181d4d67013b16e78cd
Commit Graph
2346 Commits
Author SHA1 Message Date
kevinz000andGitHub 5e961e5e43 Merge pull request #11711 from Arturlang/skateboards_cool_again 
Buffs skateboards
 2020-04-04 07:15:29 -07:00
kevinz000andGitHub 12d78dd7d8 Merge pull request #11329 from Ghommie/Ghommie-cit601 
Made laser carbines and magrifles bulkier.
 2020-04-03 16:30:47 -07:00
Artur e23bacdf6b Icons 2020-04-01 13:03:31 +03:00
Artur 65ec9f3723 Merge remote-tracking branch 'Citadel-Station-13/master' into skateboards_cool_again 2020-04-01 13:03:06 +03:00
Artur 4de14fbdf7 Finnishing touches 2020-04-01 12:59:06 +03:00
Artur dce23a40af God i wish i could auto merge icons 2020-04-01 12:05:53 +03:00
Artur f40f07b033 [READY]Skateboard overhaul (#45657) 
* skeet skeet

* scoot

* removes debug message

* merge conflict

* oopsie

* polish, new board types

* begone

* actioninja review

* passtable trait

* fixes indent

* dwarfism check

* check for existing flag

* check existing trait

* screwdriver returns FALSE
 2020-04-01 12:05:27 +03:00
kiwedesparsandGitHub 24d9045679 papermask sprites bigger edition 2020-03-31 01:47:43 -07:00
kiwedesparsandGitHub c9e1d480e9 Add files via upload 2020-03-31 01:20:53 -07:00
kevinz000andGitHub 9595df3e18 Merge pull request #11653 from zeroisthebiggay/holoparsiteportsarefunny 
ports tg holoparasite customizations
 2020-03-28 16:02:08 -07:00
kevinz000andGitHub dd90d21f93 Merge pull request #11645 from Trilbyspaceclone/vaild 
Et tu?
 2020-03-28 15:58:56 -07:00
kevinz000andGitHub eb84d426e1 Merge pull request #11634 from Ghommie/Ghommie-cit645 
Fixing a couple issues with sofas.
 2020-03-27 21:25:31 -07:00
ZeroMan 54bce5ecc6 i am hol horse 2020-03-27 18:23:18 -04:00
TrilbySpaceClone 879b626cd1 Et tu 2020-03-27 03:12:04 -04:00
Ghommie ef3106aab6 Fixing a couple issues with sofas again. 2020-03-26 19:24:56 +01:00
deathride58andGitHub 0bf2cf0484 Adds a lfwb-inspired orbiting pixel + flashing outline animation to the sprint and combat buttons (toggleable via prefs) (#11623) 
* Adds a flashing effect to the sprint and combat mode toggles (toggleable via prefs)

* Adds the ability to change the color of the hud toggle flash as well
 2020-03-26 16:51:48 +01:00
kevinz000andGitHub 388e6d46df Merge pull request #11603 from KathrinBailey/Kat-Furniture 
Kat Shutter Balancing & Sprite Updates: COVID-19 Shut-In Edition
 2020-03-25 12:22:42 -07:00
KathrinBailey 134d861fd7 KAT SHUTTERS ALL OF THE STUFF 
Checked: Animations timings, the buttons in-game (they open and close), the radiation insulation (rad shutters don't block rads once open but do once closed, 0.2x multiplier to rads). Animations all play and the shutters actually open and close.
 2020-03-24 20:13:48 +00:00
TrilbyspacecloneGitHubGhom
 		f8147e5a85 Ports over Mortars and Pestles (#11546) 
* 2 ports for the commit of 1!

ports -[ready]ghetto grinder
#43600
ports - Mortar and Pestle Fixes #48086
Links -
https://github.com/tgstation/tgstation/pull/43600
https://github.com/tgstation/tgstation/pull/48086

* what if we didnt have that...

* Apply suggestions from code review

Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>

Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>
 2020-03-24 14:03:31 +01:00
Ghommie e59e809556 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit601 2020-03-23 19:01:25 +01:00
kevinz000andGitHub ea7c1058b5 Merge pull request #11524 from Ghommie/Ghommie-cit627 
More or less ports "Clothing /under repath"
 2020-03-23 10:40:31 -07:00
kevinz000andGitHub fbe77495e8 Merge pull request #11576 from Owai-Seek/strawberryjuice3-21-2020 
Porting Juices, Drinks, and Salami [READY]
 2020-03-23 10:36:44 -07:00
Winter Flare 0effeb6ed5 Ports Hyper Drinks 
Ports Drinks from Hyper
https://github.com/quotefox/Hyper-Station-13/pull/121
https://github.com/quotefox/Hyper-Station-13/pull/192
 2020-03-22 19:33:50 -04:00
Winter Flare cd3f8f5df5 Porting More Stuff 
Ports Moana Lou
https://github.com/tgstation/tgstation/pull/46539
Ports Moscow Mule, Sol Dry
https://github.com/tgstation/tgstation/pull/48466
Ports Hivemind Eraser
https://github.com/tgstation/tgstation/pull/49325
 2020-03-22 15:13:00 -04:00
Ghommie 76ff0d4931 M/F body preferences. 2020-03-22 19:47:48 +01:00
Winter Flare 5c3037b5d0 Fixed Several Foods, Strawberry Juice 
Add Strawberry Juice
Port Salami
https://github.com/tgstation/tgstation/pull/48817
https://github.com/tgstation/tgstation/pull/49228
Ports some TG Drinks
https://github.com/tgstation/tgstation/pull/48783

Made lizards like:
Egg Wrap

Tweaked Soda Dispenser
Moved Egg Wraps
Tweaked Strawberry Tea and Strawberry Milk recipies.
 2020-03-22 00:19:28 -04:00
Ghommie 86898cc451 Force pushed updates 2020-03-22 01:43:19 +01:00
kevinz000GitHubGhom
 		0e3193e929 relatively small 71 file 700 lines changed refactor/rework to combat mode/sprint and some miscellaneous things that totally aren't important (#11376) 
* combat refactoring

* i hate this

* mobility flags part 2 time xd

* whew

* stuff

* a

* ok

* changes

* Wew

* k

* add flags

* FUCKYOUVORE

* fixes

* typo

* no using this in hard stamcrit

* update icon

* woopsy

* . = ..()

* sigh

* Update living_combat.dm

* wew

* wups

* fix

* i hate you

* wrong button

* k

* ok

* bet

* k

* Update code/modules/mob/living/living_combat.dm

Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>

* Update code/modules/mob/living/living_combat.dm

Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>

* Update code/modules/mob/living/living_combat.dm

Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>

* early returns

* skreee

* agony

* k

* k

* k

* k

* wack

* compile

* wack

Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>
 2020-03-21 16:04:26 +01:00
ZeroMan 93b1ade0bc Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into uplinkclothinggetssuckies 
# Conflicts:
#	code/modules/uplink/uplink_items/uplink_badass.dm
 2020-03-21 02:17:13 -04:00
ZeroMan 2978014a64 i require cocknball tortures 2020-03-20 14:09:28 -04:00
ZeroMan 2c0d399e15 i am actually crying 2020-03-20 14:08:32 -04:00
necromanceranneandGitHub 570f6e8a66 Plastitanium Rapier: Sleepy Edition (#11507) 
* knockout rapier, improved sprites

* it's a rapier not a foil those aren't synonyms

* whoops

* needs it's shanking sound

* Put a stamina loss threshold onto the swords slep so you need at least two hits to proc the sleep. Don't get stabbed more than once!

* Update items_and_weapons.dmi

* Removes chat spam and also frankly it doesn't need drowzy on top
 2020-03-20 16:07:04 +01:00
ZeroMan 35a4d71a54 im sorry little one 2020-03-19 21:59:14 -04:00
necromanceranneandGitHub 2b11b7ac95 Energy Gun Sprite cleanup and Animations (#11518) 
* Sprite changes and animations by goldnharl

* While I'm here I'll port over a sprite from tg for the disabler
 2020-03-20 02:37:57 +01:00
Detective Google 6b392e09c2 Merge remote-tracking branch 'upstream/master' into hudpatches 2020-03-17 16:29:13 -05:00
Detective Google 1b72357925 might as well throw the other in whilst I wait. 2020-03-17 16:26:26 -05:00
Detective Google 72f086c79e one at a time perhaps. 2020-03-17 16:24:23 -05:00
Detective Google e8d09b470d nobody can figure out why this isn't working :) 2020-03-17 16:22:42 -05:00
Detective Google af872d1476 push 2020-03-17 16:10:15 -05:00
Detective Google 37aaac60e3 third times the charm 2020-03-17 16:07:25 -05:00
Detective Google f7c9762583 icon conflicts suck 2020-03-17 16:00:24 -05:00
Detective Google 93ceaa0157 Revert "h^2" 
This reverts commit df45abfd0f.
 2020-03-17 15:56:57 -05:00
Detective Google df45abfd0f h^2 2020-03-17 15:55:07 -05:00
Detective Google c97591cc8f h 2020-03-17 15:54:17 -05:00
kevinz000andGitHub 8bc8ea71ea Merge pull request #11500 from necromanceranne/electrostarve_sprite_fix 
Electrostaff Sprite Fix
 2020-03-17 09:25:44 -07:00
kevinz000andGitHub 2e4282befa Merge pull request #11498 from necromanceranne/diaghud_fix 
Replaced and added missing Diagnostic HUDSunglasses sprites
 2020-03-17 09:25:32 -07:00
kevinz000andGitHub fd7bfaba06 Merge pull request #11480 from Ghommie/Ghommie-cit623 
Banana pies, beams. runtime errors and warnings.
 2020-03-16 13:22:49 -07:00
necromanceranne 5d134539ad wait no this does need another sprite goddamnit why does it work like this 2020-03-17 02:56:19 +11:00
necromanceranne 5eb93eaa56 And these too 2020-03-17 02:49:27 +11:00
necromanceranne b5872bba63 Pretty sure this should now use the correct sprites 2020-03-17 02:43:44 +11:00