shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
41,098 Commits 5 Branches 0 Tags
a9170aae93f228551d83147677da8ee918db9b97
Commit Graph

297 Commits

Author SHA1 Message Date
silicons
78312c23bf sigh 2020-07-28 21:53:07 -07:00
Ghom
68cd016067 Demodularizing wishgranter, some helpers, and removing unused files. (#12291) 2020-05-17 17:06:05 -07:00
TrilbySpaceClone
7761990919 soooo this complies but does it work? 2020-04-23 03:13:07 -04:00
Ghommie
c3faf94d8f WIP 2020-03-30 05:29:39 +02: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
32bfdb6712 Update cit_screenshake.dm (#11554) 2020-03-21 01:52:39 +01:00
Seris02
cccd0e9eef Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into tggenetics 2020-03-09 16:49:32 +08:00
kevinz000
7bcb37c5d1 Merge remote-tracking branch 'citadel/master' into mobility_flags 2020-01-16 21:12:56 -07:00
kevinz000
02841f8e92 compile 2020-01-15 18:49:37 -07:00
Seris02
a8e4989d74 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into tggenetics 2020-01-15 12:15:13 +08:00
Seris02
16b5c83a3a Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into tggenetics 2020-01-13 12:53:52 +08:00
Ghom
c2b3e7b0ec Merge pull request #10505 from LetterN/beep-boom 
better electropack ui
 2020-01-11 15:21:08 +01:00
Seris02
ac4489c6a8 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into tggenetics 2020-01-11 13:55:29 +08:00
kappa-sama
ab5223cb20 this took longer than all the other items combined 2020-01-10 22:40:10 -05:00
kappa-sama
0dbcf2085b bye 2020-01-10 22:30:45 -05:00
kappa-sama
9f95fb5d9b cya 2020-01-10 22:29:02 -05:00
kappa-sama
6abb7449c3 bye 2020-01-10 22:27:01 -05:00
kappa-sama
861a3c7a11 zee 2020-01-10 22:25:16 -05:00
kappa-sama
0f7b3f4ee8 death 2020-01-10 22:23:32 -05:00
kappa-sama
4ebc80e137 bye bye 2020-01-10 22:21:45 -05:00
kappa-sama
0079a5acad byye 2020-01-10 22:19:13 -05:00
Letter N
6ec3fde836 better-signalers 2020-01-10 18:06:55 +08:00
kappa-sama
ff3370d382 bye 2020-01-08 16:50:49 -05:00
kappa-sama
87698297fb bye bye 2020-01-08 16:47:28 -05:00
kappa-sama
a4da8a2dc4 bye 2020-01-08 16:37:38 -05:00
Lin
718d4a080d Merge pull request #9878 from Ghommie/Ghommie-cit382 
Unmodularize several machinery and structures
 2020-01-07 00:31:24 +00:00
kevinz000
7378d91684 ([\W\.])Knockdown\( 2020-01-06 03:39:20 -08:00
Seris02
54f859fe06 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into tggenetics 2019-12-31 17:52:49 +08:00
Seris02
862acf2f06 ports hyper's genetics 2019-12-28 21:33:15 +08:00
Commandersand
815e57697d vending 2019-12-27 12:29:39 -06:00
Ghommie
8c5e506a17 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit382 2019-12-21 18:22:58 +01:00
Lin
3dc00519fc Merge pull request #9910 from Ghommie/Ghommie-cit390 
Unmodularize gamemodes folder.
 2019-12-19 23:23:20 +00:00
Ghommie
563a0fef3c Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit390 2019-12-13 02:45:53 +01:00
Ghommie
4502d7b795 Ports improved and simplier fire alarms. 2019-12-12 22:44:20 +01:00
Putnam3145
beddaa1a99 Merge pull request #10053 from Ghommie/Ghommie-cit429 
Fixes some means of eyes blindness not working, removes legacy code.
 2019-12-09 12:40:37 -08:00
Ghommie
723690bab0 Demodularize defib disks and projectiles icons. 2019-12-06 23:07:50 +01:00
Ghommie
238655d599 Fixes eyes blindness a little. 2019-12-06 00:10:50 +01:00
Lin
99e9c7299e Merge pull request #10004 from Ghommie/Ghommie-cit414 
Unmodularizing first aid kits.
 2019-12-03 01:30:51 +00:00
Putnam3145
8d09f5a082 Merge branch 'master' into tinytweaks 2019-12-01 23:24:56 -08:00
Ghommie
9b8ed8ca4f The fact we hit 10k on issues/PRs is not a good reason to make crappy PRs. 2019-11-29 07:14:51 +01:00
BlackMajor
c81d1fe7a3 Merge pull request #9867 from Ghommie/Ghommie-cit375 
Ports "examine-code refactor"
 2019-11-25 11:31:03 +13:00
Winter Flare
fb4a47d310 Added more items to vendors. 
-Added stuff to the following:
clothing vendor
chef utensil vendor
snack vendors
kinkmate
 2019-11-23 15:58:04 -05:00
Lin
028fa518e4 Merge pull request #9879 from Ghommie/Ghommie-cit383 
Unmodularize closets.
 2019-11-23 05:39:33 +00:00
Ghommie
0ac188bde9 Unmodularize gamemodes folder. 2019-11-22 05:00:53 +01:00
Ghommie
10373c7c96 Unmodularize closets. 2019-11-20 06:41:59 +01:00
Ghommie
fe171ac40a Unmodularize several machinery and structures. 2019-11-20 06:13:57 +01:00
Ghommie
411310b0c6 Unmodularize tools and apc icons. 2019-11-20 05:18:15 +01:00
Ghommie
21f15e411d Part 3 2019-11-19 19:34:42 +01:00
Ghommie
dd101ef221 Part 2 2019-11-19 18:00:56 +01:00
Lin
c188c20f37 Merge pull request #9802 from Ghommie/Ghommie-cit349 
Unmodularize bikehorns and holy weapons.
 2019-11-19 03:24:38 +00:00