shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
32,243 Commits 5 Branches 0 Tags
0774bca2f4bc09685d2423ee995ed79cdedd7a60
Commit Graph

4246 Commits

Author SHA1 Message Date
kevinz000
0774bca2f4 wew 2020-03-25 20:51:42 -07:00
kevinz000
4a84736eff more 2020-03-24 19:57:04 -07:00
kevinz000
1a7e812d55 wip 2020-03-24 19:51:23 -07:00
kevinz000
2e0992dbb9 k 2020-03-24 19:29:54 -07:00
kevinz000
d139234c6d my smooth brain hurts 2020-03-23 16:06:40 -07:00
kevinz000
fa9c1dfd6c start 2020-03-23 16:05:22 -07:00
kevinz000
bf0970d8c3 Merge remote-tracking branch 'citadel/master' into shield_refactor 2020-03-23 15:34:04 -07:00
kevinz000
ea7c1058b5 Merge pull request #11524 from Ghommie/Ghommie-cit627 
More or less ports "Clothing /under repath"
 2020-03-23 10:40:31 -07:00
kevinz000
3990b1f4c9 Merge pull request #11571 from Ghommie/Ghommie-cit635 
Size preferences made configurable.
 2020-03-23 10:37:54 -07:00
kevinz000
dfec544d71 Merge pull request #11578 from Ghommie/Ghommie-cit636 
Fixing owner not being set in mutation/on_aquiring.
 2020-03-23 10:36:17 -07:00
kevinz000
57429493c6 Merge pull request #11581 from Ghommie/Ghommie-cit637 
M/F body preferences.
 2020-03-23 10:34:02 -07:00
kappa-sama
1d2264849e meh (#11584) 2020-03-23 15:50:53 +01:00
kevinz000
a6ca854e5c Merge remote-tracking branch 'citadel/master' into shield_refactor 2020-03-22 15:07:41 -07:00
Ghommie
c798b31d6f bodyparts cache aaaaa. 2020-03-22 22:20:26 +01:00
Ghommie
76ff0d4931 M/F body preferences. 2020-03-22 19:47:48 +01:00
Ghommie
3c2cb76792 Fixing owner not being set in mutation/on_aquiring. 2020-03-22 15:23:05 +01:00
Xantholne
71fc6bc693 Fixes bumbles resting (#11564) 
* Fixes bumbles resting

* Update code/modules/mob/living/simple_animal/friendly/bumbles.dm

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

* Update bumbles.dm

* Update bumbles.dm

Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>
 2020-03-22 13:12:14 +01:00
Putnam3145
368d47aa69 Adds ghost role eligibility to various ghost roles. (#11549) 
* Added ghost role eligibility to CTF, possession, random animal

* Also added possessed blade to it.

* Also removed some extraneous dead/observer things.

* ahaha whoops
 2020-03-22 13:02:23 +01:00
Ghommie
86898cc451 Force pushed updates 2020-03-22 01:43:19 +01:00
Ghommie
6d4433dd77 Size preferences made configurable. 2020-03-22 01:07:51 +01:00
kevinz000
c7e634b8c8 Merge pull request #11565 from Citadel-Station-13/Ghommie-patch-1 
Fixing permanent slapstick comedy creamed overlay.
 2020-03-21 10:30:12 -07:00
kevinz000
300c8e3c6d Merge remote-tracking branch 'citadel/master' into shield_refactor 2020-03-21 09:53:39 -07:00
kevinz000
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
Trilbyspaceclone
2bfc9b8ef8 Gutlunchs now like to eat bodys a bit more! (#11545) 
* Update gutlunch.dm

* hey what if we didnt just port a semi fix...
 2020-03-21 15:07:32 +01:00
Ghom
cf4f7a705d Update human.dm 2020-03-21 14:52:16 +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
kevinz000
6754b794b1 Merge remote-tracking branch 'citadel/master' into shield_refactor 2020-03-20 22:59:17 -07:00
Trilbyspaceclone
9d0dbb38f8 Update robot_modules.dm 2020-03-20 01:52:43 -04:00
ZeroMan
35a4d71a54 im sorry little one 2020-03-19 21:59:14 -04:00
kevinz000
8b0600a7fa Merge pull request #11527 from Ghommie/Ghommie-cit628 
More bug reports yee'd their last haw.
 2020-03-19 18:56:32 -07:00
kevinz000
7d46ed2bec Merge pull request #11282 from Ghommie/Ghommie-cit595 
Yeets the preferences_vore datum and migrates its stuff to preferences.
 2020-03-19 08:30:18 -07:00
Ghommie
a0294698c0 extra runtime fixes, also porting tgstation#49997 2020-03-19 04:49:01 +01:00
Ghommie
32975bf509 More bug reports yee'd their last haw. 2020-03-18 23:43:23 +01:00
kevinz000
c11275e4ba Update robot.dm (#11505) 2020-03-18 03:15:12 +01:00
kevinz000
fcf51a285d Merge pull request #11502 from Citadel-Station-13/Ghommie-patch-5 
Positronic overlays fix.
 2020-03-17 09:29:39 -07:00
kevinz000
a928681401 Merge pull request #11503 from necromanceranne/45_nerf_kitchengun_buff 
Removes stun bullet .45/Kitchen Gun a lot more desirable for heavy duty cleaning!
 2020-03-17 09:25:51 -07:00
kevinz000
c14b1c2857 linter 2020-03-16 14:18:47 -07:00
kevinz000
9bd275e430 Merge remote-tracking branch 'citadel/master' into shield_refactor 2020-03-16 13:47:53 -07:00
kevinz000
0692184a0a k 2020-03-16 13:34:07 -07:00
kevinz000
b062c76ca7 Merge pull request #11485 from Ghommie/Ghommie-cit625 
Fixing a little issue with the musician trait etcetera.
 2020-03-16 13:23:25 -07:00
kevinz000
3c97782a87 Merge pull request #11483 from Hatterhat/mining-borg-nerfs 
mining borg nerfs - "they should be outclassed lategame"
 2020-03-16 13:22:23 -07:00
kevinz000
70880624e6 implement blocktypes 2020-03-16 13:20:58 -07:00
kevinz000
ceb3d39266 k 2020-03-16 12:51:30 -07:00
kevinz000
7fdbcc55c6 s 2020-03-16 11:12:10 -07:00
kevinz000
d3724d5fbd f 2020-03-16 10:59:34 -07:00
kevinz000
e3301f8722 bet 2020-03-16 10:44:02 -07:00
necromanceranne
6f0fc2bdea I LOVE YOU KITCHEN GUN! 2020-03-17 03:20:53 +11:00
Seris02
ffb2e65c17 why I hate byond (#11496) 2020-03-16 17:20:51 +01:00
Ghom
a505806ef2 No comment. 2020-03-16 17:13:56 +01:00
Ghom
be8f5e1193 Update posibrain.dm 2020-03-16 17:05:12 +01:00