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

248 Commits

Author SHA1 Message Date
Ghom
49e36e47ff Merge pull request #11809 from kevinz000/storage_rework 
Adds baystation-style volumetric space storage support
 2020-04-14 13:17:11 +02:00
Artur
f910a0fd32 Conflict fixes 2020-04-14 09:27:54 +03:00
Ghom
b00e97b848 Merge pull request #10732 from kevinz000/eldritch_affairs 
Eldritch Affairs
 2020-04-12 20:47:19 +02:00
kevinz000
bc16600070 alternative way 2020-04-10 04:00:59 -07:00
kevinz000
165379c0b8 storage 2020-04-10 02:19:19 -07:00
kevinz000
36cd3b4c35 i should have just ported from baystation instead of reinventing the fricking wheel 2020-04-10 01:23:36 -07:00
kevinz000
e2440034f5 matrices.. 2020-04-10 01:07:53 -07:00
kevinz000
2e9e38cd89 close 2020-04-09 09:30:34 -07:00
kevinz000
857716c473 k 2020-04-09 09:30:28 -07:00
kevinz000
a888c7c29a continue 2020-04-09 02:52:32 -07:00
kevinz000
5c53314ee3 cancel 2020-04-08 00:57:09 -07:00
kevinz000
7ec669ecd4 bet 2020-04-07 16:11:58 -07:00
Artur
a903752ff9 Merge remote-tracking branch 'Citadel-Station-13/master' into Garlic 2020-03-31 19:42:35 +03:00
actioninja
f419653c28 functionality 2020-03-28 23:50:06 -07:00
kevinz000
c39dd52b5f Merge remote-tracking branch 'citadel/master' into eldritch_affairs 2020-03-27 21:32:40 -07:00
Artur
7d22cb00d0 Mixes and fixes 2020-03-25 19:32:46 +02:00
Ghommie
a2b2e08e31 Fixes crafting hud icon overlapping the second pocket on 1:1 screen mode. 2020-03-24 17:53:53 +01: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
18471be4ce cult team 2020-03-10 20:11:18 -07:00
keronshb
930643b01a Blob Reroll 
Also ports blob reroll
 2020-03-06 19:06:50 -05:00
keronshb
228012c718 Blob refactor (#43872) 
Ports over Blob Refactor from TG
 2020-03-06 15:58:17 -05:00
kevinz000
1e99cd0bfe Merge remote-tracking branch 'citadel/master' into mobility_flags 2020-03-03 03:08:41 -07:00
Ghommie
fc76cd9a9b Porting update_icon improvements. Part 1. 2020-02-27 01:21:03 +01:00
kevinz000
6a8a606f97 Merge remote-tracking branch 'citadel/master' into mobility_flags 2020-02-04 16:01:25 -07:00
Ghommie
84d9430ee4 PC too slow for compile. 2020-02-03 07:21:39 +01:00
Ghommie
81b5fe2de3 Further buff and fix for clown ops tearstache nade. 2020-02-03 07:08:47 +01:00
Artur
8bb0e30036 Initial Commit V3 2020-01-31 18:17:14 +01:00
kevinz000
611fd7ea89 Merge remote-tracking branch 'citadel/master' into mobility_flags 2020-01-27 23:35:35 -07:00
Ghommie
721fd108f9 A few more, ported, runtime fixes. 2020-01-24 03:02:07 +01:00
kevinz000
7bcb37c5d1 Merge remote-tracking branch 'citadel/master' into mobility_flags 2020-01-16 21:12:56 -07:00
kevinz000
9ef4cbfa76 refactor tags 2020-01-16 20:58:00 -07:00
Putnam
d29603ad77 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into arousal-bad 2020-01-15 15:57:32 -08:00
kevinz000
b341818f04 mobility flags 2020-01-12 11:00:12 -08:00
AffectedArc07
16a37e2769 Standardises all files from CRLF to LF 2020-01-12 14:28:01 +00:00
kevinz000
9fd9f60855 compile 2020-01-11 10:49:44 -08:00
Putnam
d75a525b3c let's fix arousal huh 2020-01-05 19:10:48 -08:00
Ghommie
395457f7ef Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit471 2019-12-21 17:59:32 +01:00
Linzolle
70e50e57cd Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into abductor-update 2019-12-17 20:21:49 -06:00
Putnam3145
670141edf7 Merge pull request #10209 from Ghommie/Ghommie-cit470 
ports "Standardize obj/updateicon() and update_icons() to update_icon()"
 2019-12-17 11:26:36 -08:00
Ghommie
80402a0d88 Ports some hud and update_icon code updates. 2019-12-16 23:29:20 +01:00
Ghommie
447f416ca6 Merge branch 'Ghommie-cit470' of https://github.com/Ghommie/Citadel-Station-13 into Ghommie-cit471 2019-12-16 19:10:07 +01:00
Ghommie
93fbc17428 ports "Standardize obj/updateicon() and update_icons() to update_icon()" 2019-12-16 17:58:50 +01:00
Useroth
8151a1f3ff Merged master into this branch. 2019-12-16 12:06:30 +01:00
Putnam3145
c39a5d0462 Merge pull request #10011 from Arturlang/Bloodsuckers 
Bloodsuckers, or, yknow, vampires.
 2019-12-15 14:41:36 -08:00
Useroth
5e836c51e4 Forgot to track the new files 2019-12-08 14:05:05 +01:00
Useroth
a37f2de71d First step of porting lavaland tumors. Looks like Cita is much behind tg regarding simplemobs. 2019-12-08 14:00:08 +01:00
Artur
02048ce009 Bludsuckers 2019-11-29 21:28:14 +02:00
Ghommie
3b8aebbbc2 refactoring altclick interaction to allow parent calls without forcing the turf contents stat menu open. 2019-11-29 00:40:16 +01:00
Linzolle
cc54e5230f Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into abductor-update 2019-11-25 21:01:25 -06:00
BlackMajor
786d40032d Merge pull request #9922 from GrayRachnid/braintraumasport 
Ports new Brain Traumas from /tg/. Does not include the shitty creeper antag or Wizard Traumas, i'm porting wizard traumas later. Also adds the Desynchronizer and changes the way some heaRing args are handled.
 2019-11-25 12:31:15 +13:00