shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
46,479 Commits 5 Branches 0 Tags
e511c19ff065e370ece54c68f46fdc8805139cff
Commit Graph

429 Commits

Author SHA1 Message Date
SandPoot 5dad84a486 Update files 2022-05-16 21:44:25 -03:00
SandPoot 586a035132 Update files 2022-04-06 18:41:31 -03:00
DeltaFire 6aa906395c not a gaius reference 
hhhh let me just replace all the ex_acts missing some args and adjust them
 2021-11-14 21:34:59 +01:00
Letter N bcdf96f274 Revert "TGUI alerts, lists, inputs" 2021-10-28 12:17:29 +08:00
SandPoot 437b3105d1 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into tgui-alerts-and-what-not 2021-10-08 21:05:41 -03:00
SandPoot 5aa12b4716 There's a bounty for this right? i spent nearly two full days at this 2021-10-05 18:10:32 -03:00
SandPoot bbe32fa38a Upload files 2021-10-05 00:33:49 -03:00
keronshb c8814e8cc8 Merge remote-tracking branch 'upstream/master' into dynamicport 2021-09-19 18:09:18 -04:00
zeroisthebiggay 7fce515ca4 Update robot_modules.dm 2021-09-19 16:01:29 -04:00
zeroisthebiggay 4ab88cfcdb Update robot_modules.dm 2021-09-19 15:59:45 -04:00
zeroisthebiggay 2f903353a6 Update robot_modules.dm 2021-09-19 15:56:40 -04:00
zerothebigboy c6ce359cda Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into ninjasarecum 
# Conflicts:
#	tgstation.dme
 2021-09-19 15:23:52 -04:00
keronshb 6cc4e35b44 Mob lists 2021-09-19 13:28:41 -04:00
SandPoot 759852a31d Update inventory.dm 2021-09-08 20:02:23 -03:00
SandPoot 37e2470616 Upload files 2021-09-08 19:53:47 -03:00
zerothebigboy 06181f51ae Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into ninjasarecum 
# Conflicts:
#	code/modules/ninja/suit/suit.dm
 2021-08-19 21:55:22 -04:00
Artur 82ccfc40dc /obj/screen --> /atom/movable/screen 2021-07-29 13:57:19 +03:00
silicons 5e1cb8da38 more 2021-06-28 14:27:38 -07:00
silicons 805b931fb8 config reorganize start 2021-06-28 13:35:52 -07:00
silicons 0069f12c6f errors 2021-06-28 13:17:14 -07:00
silicons a5a476f457 cyborg shovies 2021-06-28 13:10:40 -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 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 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 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 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
SandPoot a0c92f0646 upload files 2021-02-11 13:22:37 -03:00
zeroisthebiggay 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
shellspeed1 81e37b6e33 Update robot_modules.dm 2021-01-19 21:40:47 -08:00
Timothy Teakettle 016d3d39fc emote over holopad 2020-12-13 22:18:54 +00:00
timothyteakettle 76b291c0b5 action 2020-12-13 01:16:25 +00:00
silicons 803bff4e5f funny 2020-11-12 23:34:42 -07:00
silicons 1b1efce556 Merge remote-tracking branch 'citadel/master' into combat_rework_experimental 2020-10-06 17:11:21 -07:00
DeltaFire d54a899695 fixes KA modkits being installed in borgs by others 
These have been broken for so long holy fuck
 2020-10-01 17:13:03 +02:00