shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
35,902 Commits 5 Branches 0 Tags
f1c242aadccb8c3aebc66b4e5cfada69a0dc4ec7
Commit Graph

141 Commits

Author SHA1 Message Date
Timothy Teakettle
d7bce8aec0 ports some events 2020-06-15 20:22:40 +01:00
Ghom
968426fd48 Combat mode component. (#12338) 
* Combat mode component.

* Whoops.

* test.

* Oh

* refs begone, and documentation.
 2020-05-27 18:00:32 -07:00
kevinz000
e271376c4e Merge pull request #11830 from Ghommie/Ghommie-cit676 
Fixes the phantom thief component, again
 2020-04-14 01:34:18 -07:00
Ghommie
42ff9b1d35 Final test, fixes and parent calls. 2020-04-14 01:23:26 +02:00
Ghommie
05a954f000 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit611 2020-04-13 02:01:01 +02:00
Ghom
13f9c3c235 Update phantomthief.dm 2020-04-12 08:03:30 +02:00
Ghommie
acb5c39b59 Fixes the phantom thief component for the Xth time. 2020-04-12 07:47:28 +02:00
Ghommie
2bf6d888bd Ports "Obliterates item_color: new washing machine functionality edition" 2020-03-30 18:31:26 +02: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
necromanceranne
94c700a06c NVG Nerf/Syndicate NVG Buff (#11548) 
* nerfs the shit out of nvg and gives syndicate special flashproof versions

* forgot about this one

* bleh
 2020-03-21 15:31:59 +01:00
Detective Google
6b392e09c2 Merge remote-tracking branch 'upstream/master' into hudpatches 2020-03-17 16:29:13 -05:00
Detective Google
af872d1476 push 2020-03-17 16:10:15 -05:00
necromanceranne
19fd006103 Fixed some missing sprites 2020-03-17 02:12:28 +11:00
Detective Google
828b5cdacf why was this backwards 2020-03-16 01:57:23 -05:00
Detective Google
94f694e568 adds some hudpatches 
seemed like fun flavor, inspired by bay and a request.
 2020-03-16 01:44:26 -05:00
Ghommie
2b4b626fac support for items that switch states through update_icon. 2020-03-10 16:55:30 +01:00
kevinz000
e210f7d535 Merge pull request #11391 from Ghommie/Ghommie-cit612 
Porting "Further update_icon splitup"
 2020-03-10 05:58:17 -07:00
Ghommie
ad4d290ea7 WIP 2020-03-08 19:26:01 +01:00
Trilbyspaceclone
748614b98a Apply suggestions from code review 
Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>
 2020-03-07 08:26:15 -05:00
Trilbyspaceclone
da48f95de7 Update hud.dm 2020-03-02 00:11:54 -05:00
Trilbyspaceclone
684b7714db Update hud.dm 2020-03-01 08:21:25 -05:00
TrilbySpaceClone
51c675603e ??? 2020-03-01 02:48:13 -05: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
Artur
c9dc35fd9a Updates the debug outfit 2020-02-06 18:42:23 +01:00
Ghommie
95db5084ab Screw commit history. 2020-02-02 01:26:04 +01:00
Ghommie
5875f2578c demodularize and removes lot of unused clothing with missing sprites. 2020-01-28 02:32:46 +01:00
Seris02
25d7af31a5 merge fixes 2020-01-19 16:36:04 +08:00
AffectedArc07
16a37e2769 Standardises all files from CRLF to LF 2020-01-12 14:28:01 +00:00
Lin
e5e2e4f012 Merge pull request #10329 from Ghommie/Ghommie-cit490 
Ports reagents id removal and typepath usage.
 2020-01-10 01:34:39 +00:00
Lin
c4cb06f8f0 Merge pull request #10112 from Ghommie/Ghommie-cit447 
Refactors that mess of a code for alternate worn clothing sprites for digitigrade and taurs.
 2020-01-10 01:31:20 +00:00
Ghommie
4d06d231f8 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit490 2020-01-02 17:49:01 +01:00
Seris02
46da6604a4 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into stunglasses 2020-01-01 19:28:56 +08:00
Ghom
93e090d229 Merge pull request #10309 from Seris02/disablerglasses 
disabler sechuds, let the adminbus commence
 2019-12-31 14:43:39 +01:00
Ghommie
80e716eeaf Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit447 2019-12-30 18:14:47 +01:00
Trilbyspaceclone
24d4684afb Maybe he means this? 2019-12-30 03:56:44 -05:00
Trilbyspaceclone
1cc4464726 Update engine_goggles.dm 2019-12-29 15:01:02 -05:00
Trilbyspaceclone
ee7346f280 got it 2019-12-29 15:00:33 -05:00
Seris02
f6caff8227 hnnnnnng code improvements 2019-12-29 20:10:15 +08:00
Seris02
1d449fcd12 changes 2019-12-29 19:46:47 +08:00
Ghommie
21cfb2914b Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit490 2019-12-27 17:49:59 +01:00
Seris02
0b6242e25d let the adminbus commence 2019-12-28 00:40:55 +08:00
Seris02
160e8c1ec5 stunglasses 2019-12-27 23:21:40 +08:00
Trilbyspaceclone
a4f12af2e6 Update engine_goggles.dm 2019-12-26 19:28:16 -05:00
Ghommie
e74339ce8b Jfc that's a lot of work! 2019-12-23 04:24:13 +01:00
Ghommie
fb2b259d92 Ports "Refactors can_see_reagents" 2019-12-19 17:17:18 +01:00
Ghommie
3fcb7808fd args 2019-12-13 02:30:17 +01:00
Lin
9ec8458803 Merge pull request #9983 from Ghommie/Ghommie-cit408 
refactoring altclick interaction to allow parent calls without forcing the turf contents stat menu open.
 2019-12-10 23:52:31 +00:00
Ghommie
414d4b7a90 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit408 2019-12-09 00:04:22 +01:00
Ghommie
238655d599 Fixes eyes blindness a little. 2019-12-06 00:10:50 +01:00