shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
18,184 Commits 5 Branches 0 Tags
6337fb77ec29b67a250ea0593e9aa9123790c5b3
Commit Graph

374 Commits

Author SHA1 Message Date
slate
6337fb77ec ports 3 new borg sprites from rp's codebase to main's. (#7409) 
engineering gets a new mr. handy sprite
medical gets a new eyebot sprite
security gets a new spider-tank sprite
 2018-07-29 23:29:25 -07:00
LetterJay
fc21ee9f36 REMOVE 2018-07-25 22:12:34 -05:00
LetterJay
42cb534ad0 sprite/desc change 2018-07-25 06:38:54 -05:00
LetterJay
dbe376d751 bad names/var 2018-07-23 07:52:13 -05:00
LetterJay
82027db961 thing 2018-07-22 00:07:22 -05:00
deathride58
6cef81d979 It's a feature now - makes it plausible to use custom say verbs in place of emotes (allows proper non-buggy emotes over radio) (#7378) 
* it's a feature now - makes it plausible to use custom say verbs in place of emotes

* Makes the thing actually drop the , ""
 2018-07-20 03:41:12 -07:00
deathride58
77c2970b49 buffs the syndicate mask, makes it cost 2 tc (#7147) 2018-07-20 03:39:54 -07:00
deathride58
815767d475 Merge pull request #7381 from ursamedium/minor 
Minor grammar fix + crow pAI rest fix
 2018-07-18 18:08:08 -04:00
deathride58
d4fac96c70 Merge pull request #7374 from Citadel-Station-13/kevinz000-patch-1 
hardcaps stamina to 200 again
 2018-07-18 18:07:37 -04:00
Bear
586d3a3456 super minor fix 2018-07-18 01:22:56 -04:00
deathride58
f74eff85ba Merge pull request #7365 from Trilbyspaceclone/patch-6 
Makes Revs have a min pop needed
 2018-07-17 11:19:27 -04:00
kevinz000
e3d7ce9793 Update damage_procs.dm 2018-07-16 01:50:33 -07:00
kevinz000
f081239613 Update damage_procs.dm 2018-07-15 23:00:48 -07:00
deathride58
10b9e8ab99 Merge pull request #7023 from Citadel-Station-13/lmao 
Telebatons/policebatons buffed to be a viable stun weapon (but not as good as stunbatons/prods), secways nerfed to non-sprint movespeed with sprint buffer (but this time they're actually responsive instead of being laggy and the buffer is weaker)
 2018-07-15 17:51:12 -04:00
Trilbyspaceclone
c0bd256178 Makes revs have a min pop needed 
Needs 20 players min to make sure there is a Head and at lest one sec officer more then likely
 2018-07-13 11:32:47 -04:00
deathride58
c8b9e94d1e Merge pull request #7354 from Trilbyspaceclone/patch-6 
Removes armor form Non-head only Trek suits
 2018-07-10 02:04:18 -04:00
deathride58
914967f081 Merge pull request #7356 from Trilbyspaceclone/WT-550 
Hopefully this will add in the missing WT-550 Toxin Ammo for sec
 2018-07-10 02:03:08 -04:00
deathride58
1145a66ec3 Merge pull request #7345 from LetterN/patch-5 
adds plushnar and plushvar on chapvendors
 2018-07-10 02:01:21 -04:00
deathride58
fc9b99173b Merge pull request #7344 from LetterN/fix-1 
fixes lewd handcuffs
 2018-07-10 01:59:36 -04:00
deathride58
c1ae3a7ba6 fixes democracy 2018-07-07 14:10:32 -04:00
Trilbyspaceclone
00f84818a1 Remove spaces at the ends of the paths 
Ima dork and forgot to remove those
 2018-07-07 09:13:23 -04:00
Trilbyspaceclone
1e31149039 Removes the //Cit Change 2018-07-07 00:48:04 -04:00
TrilbySpaceClone
7f9365e1db Modularized, plz dont yell at me 2018-07-06 17:42:24 -04:00
TrilbySpaceClone
54779cae1d Modularized, plz dont yell at me 2018-07-06 17:37:50 -04:00
TrilbySpaceClone
71c259b0c4 MoModularized, plz don't yell at me 2018-07-06 17:33:07 -04:00
Trilbyspaceclone
0b0820937d Update trek_under.dm 2018-07-06 14:03:04 -04:00
Trilbyspaceclone
114c53c4f2 Removes armor form Non-head only suits 
Basically get better armored suits then sec do!
 2018-07-06 13:46:24 -04:00
Letter N
c258941098 Update vending.dm 2018-07-06 17:26:55 +08:00
Letter N
5c79a794ec Update holy_weapons.dm 2018-07-06 17:20:30 +08:00
Letter N
bff55cc362 Update handcuffs.dm 2018-07-06 17:19:56 +08:00
LetterJay
981743a170 Update custom_items.dm 2018-07-06 00:54:21 -05:00
LetterJay
5ad7fc35fd Update __donator.dm 2018-07-06 00:54:01 -05:00
LetterJay
a64dba6270 Merge branch 'flagcape' 
# Conflicts:
#	icons/obj/custom.dmi
#	modular_citadel/code/modules/client/loadout/__donator.dm
#	modular_citadel/code/modules/custom_loadout/custom_items.dm
 2018-07-06 00:51:42 -05:00
LetterJay
b245b940a4 Update custom_items.dm 2018-07-06 00:46:48 -05:00
LetterJay
5cacbfbe2e Merge branch 'flagcape' of https://github.com/Citadel-Station-13/Citadel-Station-13 into flagcape 
# Conflicts:
#	modular_citadel/code/modules/custom_loadout/custom_items.dm
 2018-07-06 00:45:52 -05:00
LetterJay
637c64f55b fuk 2018-07-06 00:42:25 -05:00
deathride58
5f4e19000d Merge pull request #7308 from Citadel-Station-13/kevinz000-patch-9 
protects load_mentors from accidental wipe due to advproccall interrupting sql operations
 2018-07-06 01:40:20 -04:00
LetterJay
034a7da744 Merge pull request #7029 from Citadel-Station-13/kitsundevilwings 
Adds devilwings donor item for kitsun
 2018-07-06 00:40:00 -05:00
deathride58
cec2871db2 Merge pull request #7293 from LetterN/patch-4 
fixes kinkmate
 2018-07-06 01:36:15 -04:00
deathride58
5924595c8d adds icon_override 2018-07-06 00:48:21 -04:00
LetterJay
8e0a1a64af oops 2018-07-05 23:44:44 -05:00
LetterJay
f8828db041 donator cape 2018-07-05 23:43:47 -05:00
deathride58
759dddb821 Fixes signals 2018-07-05 01:42:05 -04:00
deathride58
ac6fddcfb3 Merge remote-tracking branch 'upstream/master' into hopefullythefinalhardsync 2018-07-05 00:17:44 -04:00
deathride58
cc628a905e two major fixes - fixes flavortext and right click exploit 2018-07-04 16:41:55 -04:00
Letter N
abc32ed0df adds "cap's female formal outfit" (#7307) 
* Update under.dm

* modifies cit_clothes.dmi

* Updates uniforms.dmi

* Update security.dm

* now wont remove other clothing stuff (TM)

* Add files via upload

* Update under.dm
 2018-07-04 05:37:01 -07:00
kevinz000
80f8f7e1b1 Update mentor.dm 2018-07-03 06:33:33 -07:00
deathride58
f986f9c9f2 makes it compile. should work. hopefully 2018-07-02 15:35:11 -04:00
Letter N
493a356338 Update machine_circuitboards.dm 2018-07-02 09:13:28 +00:00
deathride58
5c2b858e4c Merge pull request #7228 from improvedname/rubber-shot-edition! 
adds rubbershot versions for sec rifless
 2018-06-26 14:08:25 -04:00