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

196 Commits

Author SHA1 Message Date
Lin
8379169b81 Merge pull request #11476 from kevinz000/shield_refactor 
Completely overhauls how blocking, shields, reflecting, and anything in between is handled. Has some small gameplay effects.
 2020-04-07 20:47:15 +00:00
kiwedespars
9b6cd54abf there's an extra space and it bugged me im sorry 2020-04-02 00:35:38 -07:00
kiwedespars
eeccea989c purple nerf - light pink gets epi back 2020-04-02 00:34:44 -07:00
kiwedespars
d9e8db8a6c Update _status_effects.dm 2020-04-01 23:31:51 -07:00
kevinz000
bf0970d8c3 Merge remote-tracking branch 'citadel/master' into shield_refactor 2020-03-23 15:34:04 -07:00
kevinz000
a6ca854e5c Merge remote-tracking branch 'citadel/master' into shield_refactor 2020-03-22 15:07:41 -07:00
Ghommie
76ff0d4931 M/F body preferences. 2020-03-22 19:47:48 +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
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
kevinz000
6754b794b1 Merge remote-tracking branch 'citadel/master' into shield_refactor 2020-03-20 22:59:17 -07:00
Ghommie
32975bf509 More bug reports yee'd their last haw. 2020-03-18 23:43:23 +01:00
kevinz000
7fdbcc55c6 s 2020-03-16 11:12:10 -07:00
kevinz000
93d995eb18 k 2020-03-06 10:13:11 -07:00
Ghommie
8fbfd07692 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit229 2020-02-22 00:55:32 +01:00
Ghommie
23ae9996d2 Something more about runtime errors. 2020-02-16 15:24:15 +01:00
Ghommie
a726f09201 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit229 2020-02-04 03:54:52 +01:00
Ghommie
95db5084ab Screw commit history. 2020-02-02 01:26:04 +01:00
Ghommie
335fd6ffa1 a 2020-01-31 19:32:35 +01:00
Ghommie
7f14fa3c71 not-so-wip now. 2020-01-31 19:20:59 +01:00
Ghommie
188f726ffd unicode support port wip 2020-01-31 05:32:00 +01:00
Ghom
dca1d8bcd3 Merge pull request #10761 from Putnam3145/fix-forced-gender 
Makes gender change potion not work on people with pref
 2020-01-29 05:31:18 +01:00
Putnam
cfd65d812a Makes gender change potion not work on people with pref 2020-01-27 19:13:50 -08:00
kevinz000
603ab65ed1 Merge pull request #10151 from Ghommie/Ghommie-cit450 
refactors area code to allow for multiple areas to share the same APC, fire, air alarms etc.
 2020-01-25 19:33:26 -07:00
Ghommie
5644617786 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit450 2020-01-20 20:59:38 +01:00
Ghommie
f45f979c27 Merge branch 'Ghommie-cit265' of https://github.com/Ghommie/Citadel-Station-13 into Ghommie-cit435 2020-01-12 23:21:03 +01:00
Ghommie
b4c0433d6d more work. 2019-12-27 17:45:19 +01:00
Ghommie
53d142b4c0 more work. 2019-12-25 01:34:33 +01:00
Ghommie
e74339ce8b Jfc that's a lot of work! 2019-12-23 04:24:13 +01:00
Ghommie
19a3aca619 I fear for my powernet 2019-12-10 15:33:15 +01:00
Ghommie
91e628c73d Ports timestop and sepia extracts improvements/tweaks. 2019-12-06 19:01:42 +01:00
BlackMajor
a6f48ea74c Merge pull request #9372 from Weblure/Xenobio-Hotkeys 
[Ready] [Test Merge] Ports Xenobio Hotkeys
 2019-12-06 11:29:34 +13:00
kevinz000
804ee207e3 Update _status_effects.dm 2019-11-25 22:52:19 -07:00
kevinz000
70ec955ef3 Update _status_effects.dm 2019-11-25 22:47:24 -07:00
BlackMajor
c81d1fe7a3 Merge pull request #9867 from Ghommie/Ghommie-cit375 
Ports "examine-code refactor"
 2019-11-25 11:31:03 +13:00
Ghommie
dd101ef221 Part 2 2019-11-19 18:00:56 +01:00
Ghommie
6d6cc93e50 Ports "Self sustaining fix" 2019-11-17 02:59:38 +01:00
Ghommie
98bc6d6c60 Ports "Ghosts can now see the AI's camera" and "Removes error message while shunting [fix]" 2019-11-14 23:33:37 +01:00
Weblure
3dac695d53 Merge branch 'master' into Xenobio-Hotkeys 2019-11-10 21:55:22 -07:00
Ghommie
a650e1e411 Ports "Renames is_hot and is_sharp to get_temperature and get_sharpness" 2019-11-05 05:37:28 +01:00
Weblure
4ca5841828 Fixed an invalid variable call in a string 
[p_theyre()] to [M.p_theyre()]
 2019-10-29 21:45:36 -07:00
kevinz000
ae4aee794e Merge pull request #9592 from Ghommie/Ghommie-cit262 
Porting movespeed modification system updates.
 2019-10-29 21:27:53 -07:00
kevinz000
8b22c95479 Merge pull request #9606 from Ghommie/Ghommie-cit270 
Unmodularize research.
 2019-10-25 20:09:26 -07:00
Ghommie
cb74be29ae Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit262 2019-10-25 12:40:50 +02:00
kevinz000
2ae111eaf0 Merge pull request #9587 from Ghommie/Ghommie-cit258 
Porting components updates and fixing phantom thief component.
 2019-10-24 18:38:39 -07:00
Ghommie
6f19899dd2 Unmodularize research. 2019-10-24 23:28:15 +02:00
Ghommie
a95b13c24a jetpack fixes too & co 2019-10-23 19:31:54 +02:00
Ghommie
c882c098cc Porting movespeed modification system updates. 2019-10-23 19:24:34 +02:00
Ghommie
e1928a18f1 Porting GetComponent macros removal, and some related changes. 2019-10-23 15:04:28 +02:00
Ghommie
fc1f10c97f Porting components updates and fixing phantom thief component. 2019-10-23 13:01:31 +02:00