Commit Graph
302 Commits
Author SHA1 Message Date
deathride58 16cd2fcd43 lets try to fix this donor item 2018-08-12 18:38:40 -04:00
LetterJay 070448f68f fix 2018-08-06 11:35:58 -05:00
LetterJayandGitHub 626c5a018e Update __donator.dm 2018-08-05 20:14:52 -05:00
deathride58andGitHub 2840a3f933 Merge pull request #7416 from Citadel-Station-13/kevinz000-patch-5
halves hypospray times
2018-08-04 00:09:05 -04:00
deathride58andGitHub d9c751114b Merge pull request #7417 from Citadel-Station-13/kevinz000-patch-6
doubles hypovial storage
2018-08-04 00:08:56 -04:00
deathride58andGitHub bbb5c1f6d5 Merge pull request #7432 from Citadel-Station-13/quickfix002
Icon Fix
2018-08-04 00:08:00 -04:00
deathride58andkevinz000 4208d6ea5f Adds boombox donor item for Raiq/chefferz (#7368) 2018-08-03 19:29:19 -07:00
LetterJay a56220634a i have no idea 2018-08-03 19:47:21 -05:00
LetterJayandGitHub 166e6b66de Update toys.dm 2018-08-01 08:41:10 -05:00
LetterJay 77b3c46dbf moves some stuff around 2018-08-01 08:07:56 -05:00
LetterJayandGitHub ce4da89cf1 Update custom_items.dm 2018-08-01 07:32:16 -05:00
LetterJayandGitHub 7293bf85b5 Update custom_items.dm 2018-08-01 07:22:41 -05:00
LetterJay e475970385 donate 2018-07-30 09:23:12 -05:00
slateandkevinz000 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
kevinz000andGitHub 349eb64e53 Update hypovial.dm 2018-07-28 03:11:01 -07:00
kevinz000andGitHub b35ea6b472 Update hypospraymkii.dm 2018-07-28 03:09:58 -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
deathride58andkevinz000 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
deathride58andkevinz000 77c2970b49 buffs the syndicate mask, makes it cost 2 tc (#7147) 2018-07-20 03:39:54 -07:00
kevinz000andGitHub e3d7ce9793 Update damage_procs.dm 2018-07-16 01:50:33 -07:00
kevinz000andGitHub f081239613 Update damage_procs.dm 2018-07-15 23:00:48 -07:00
deathride58andGitHub 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
deathride58andGitHub 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 c1ae3a7ba6 fixes democracy 2018-07-07 14:10:32 -04:00
TrilbyspacecloneandGitHub 00f84818a1 Remove spaces at the ends of the paths
Ima dork and forgot to remove those
2018-07-07 09:13:23 -04:00
TrilbyspacecloneandGitHub 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
TrilbyspacecloneandGitHub 0b0820937d Update trek_under.dm 2018-07-06 14:03:04 -04:00
TrilbyspacecloneandGitHub 114c53c4f2 Removes armor form Non-head only suits
Basically get better armored suits then sec do!
2018-07-06 13:46:24 -04:00
LetterJayandGitHub 981743a170 Update custom_items.dm 2018-07-06 00:54:21 -05:00
LetterJayandGitHub 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
LetterJayandGitHub 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
deathride58andGitHub 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
LetterJayandGitHub 034a7da744 Merge pull request #7029 from Citadel-Station-13/kitsundevilwings
Adds devilwings donor item for kitsun
2018-07-06 00:40:00 -05:00
deathride58andGitHub 5924595c8d adds icon_override 2018-07-06 00:48:21 -04:00
LetterJayandGitHub 8e0a1a64af oops 2018-07-05 23:44:44 -05:00
LetterJay f8828db041 donator cape 2018-07-05 23:43:47 -05:00
deathride58 ac6fddcfb3 Merge remote-tracking branch 'upstream/master' into hopefullythefinalhardsync 2018-07-05 00:17:44 -04:00
Letter Nandkevinz000 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
kevinz000andGitHub 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
deathride58andGitHub 5c2b858e4c Merge pull request #7228 from improvedname/rubber-shot-edition!
adds rubbershot versions for sec rifless
2018-06-26 14:08:25 -04:00