shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
48,445 Commits 5 Branches 0 Tags
master
Commit Graph
909 Commits
Author SHA1 Message Date
siliconsandGitHub 0dd8c03286 Update examine.dm 2021-06-21 17:43:05 -07:00
Putnam3145 fbbae70527 i need to go to bed and this is a LOT 2021-06-21 10:14:50 -07:00
Putnam 833d34ba8e Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into auxtools-atmos 2021-06-11 16:28:12 -07:00
Putnam 3b25f3e199 Started expanding auxgm a bit 2021-06-10 04:40:23 -07:00
zerothebigboy 1a90c96e4b Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into ninjasarecum 
# Conflicts:
#	icons/mob/clothing/feet.dmi
#	icons/mob/clothing/feet_digi.dmi
#	icons/mob/clothing/head.dmi
#	icons/mob/clothing/mask.dmi
#	icons/mob/clothing/mask_muzzled.dmi
#	icons/obj/clothing/hats.dmi
#	icons/obj/clothing/masks.dmi
#	icons/obj/items_and_weapons.dmi
 2021-06-09 17:40:28 -04:00
SandPoot b0940456f5 upload files 2021-06-08 13:13:22 -03:00
zerothebigboy bd186d25cf Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into ninjasarecum 2021-05-23 15:29:20 -04:00
zerothebigboy 315e4fcdaa look at this dude 2021-05-09 19:28:07 -04:00
zerothebigboy d2dbd7572b cyborgs and runtime fixes 2021-05-09 19:09:58 -04:00
SandPoot 9cf04467a7 upload files 2021-05-05 17:55:30 -03:00
zerothebigboy 359c778955 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into ninjasarecum 
# Conflicts:
#	code/modules/ninja/suit/ninjaDrainAct.dm
 2021-05-02 22:47:39 -04:00
LetterN 292f67e098 Merge remote-tracking branch 'origin/master' into perlin-genny 2021-03-20 20:36:56 +08:00
zerothebigboy 01d92230a3 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into ninjasarecum 
# Conflicts:
#	icons/mob/clothing/mask.dmi
 2021-03-16 19:19:12 -04:00
Letter N 935e46b492 The Mapping Update 
Cleans up the map (again)
Makes mining code more better
 2021-03-12 12:11:35 +08:00
Letter N 59a725c25a icon(s) fixes and fixes boards 2021-03-10 11:26:33 +08:00
zerothebigboy 165966ffeb Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into ninjasarecum 
# Conflicts:
#	icons/mob/clothing/suit.dmi
 2021-02-28 22:13:00 -05:00
Letter N 5304029dd9 Merge remote-tracking branch 'origin/master' into hardsync-1.5 2021-02-23 11:01:42 +08:00
zerothebigboy d0beec1364 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into ninjasarecum 
# Conflicts:
#	icons/mob/clothing/suit.dmi
#	icons/obj/clothing/suits.dmi
 2021-02-19 09:07:27 -05:00
Letter N 037378eb7d Merge remote-tracking branch 'origin/master' into hardsync-1.5 2021-02-19 10:34:47 +08:00
Letter N 501d33cddd agony 2021-02-19 10:32:24 +08:00
SandPoot 123de14009 upload files 2021-02-18 15:05:39 -03:00
SandPoot f738023097 Revert "Merge branch 'tool_behavior-replacing' of https://github.com/SandPoot/Citadel-Station-13 into tool_behavior-replacing" 
This reverts commit 2e29f30fdf, reversing
changes made to 724910cfab.
 2021-02-18 15:04:46 -03:00
SandPoot 2e29f30fdf Merge branch 'tool_behavior-replacing' of https://github.com/SandPoot/Citadel-Station-13 into tool_behavior-replacing 2021-02-18 15:04:22 -03:00
SandPoot cf2e70671a upload files 2021-02-18 14:47:10 -03:00
Letter N 3f40e353aa Merge remote-tracking branch 'origin/master' into hardsync-1.5 2021-02-16 19:41:53 +08:00
silicons 3cac44b2f0 a 2021-02-15 19:35:16 -07:00
silicons 2ef33c5c88 sprint updates 2021-02-13 20:24:26 -07:00
Letter N 45d6a5f87f it compiles, UNTESTED YET 2021-02-13 21:41:59 +08:00
Letter N 5db87b9065 more updates! 2021-02-12 17:52:59 +08:00
SandPoot a0c92f0646 upload files 2021-02-11 13:22:37 -03:00
zeroisthebiggayandGitHub aa2e11a417 medica medica medica medica 
medica medica medica medica
 2021-02-10 20:53:29 -05:00
zerothebigboy ec8029b0cc a couple more fixes 2021-02-10 20:00:04 -05:00
zerothebigboy de2e410c6f a bit more stuff 2021-02-10 18:55:56 -05:00
LinandGitHub 0dd82df64b Merge pull request #14113 from silicons/piggybacking 
fixes piggybacking initial offsets. Also, adds the ability to carry around pAIs, because this totally won't result in more metaclique drama.
 2021-01-31 23:33:59 -06:00
MrJWhit 8603a9fc77 Update ai.dm 2021-01-22 19:26:42 -05:00
MrJWhit 01d6d40d8e Port'n 2021-01-22 19:04:37 -05:00
silicons 34473c2ac7 fix 2021-01-20 16:55:19 -07:00
shellspeed1 81e37b6e33 Update robot_modules.dm 2021-01-19 21:40:47 -08:00
silicons dedb0cb62e Merge remote-tracking branch 'citadel/master' into tgsync 2021-01-19 04:24:42 -07:00
silicons ea07ad6e48 Merge remote-tracking branch 'citadel/master' into tgsync 2021-01-13 15:41:28 -07:00
siliconsandGitHub 33ca6c34a1 Update pai.dm 2021-01-13 14:48:59 -07:00
DeltaFire bc29b80c94 :lazy: 2021-01-09 22:46:40 +01:00
silicons ddad368d6a Merge remote-tracking branch 'citadel/master' into tgsync 2021-01-08 00:33:57 -08:00
Timothy Teakettle 5bc7c5a448 revert 2020-12-30 02:21:30 +00:00
Letter N 56fb81d02c Immursive Audio 2 2020-12-24 11:06:49 +08:00
Timothy Teakettle 016d3d39fc emote over holopad 2020-12-13 22:18:54 +00:00
Timothy Teakettle 76fe9c7f4c swap cooldown and cooldown check lines 2020-12-13 02:34:52 +00:00
Timothy Teakettle 866220aefb better cooldown 2020-12-13 02:33:57 +00:00
timothyteakettle 76b291c0b5 action 2020-12-13 01:16:25 +00:00
timothyteakettle 3a017d1173 it works 2020-12-12 01:49:50 +00:00