shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
18,353 Commits 5 Branches 0 Tags
3ffdfb5bee632c2ed0bc2edf51eabf4c59f9958c
Commit Graph

315 Commits

Author SHA1 Message Date
Poojawa
3ffdfb5bee Forces Vore prefs to use rust_g 
This probably fixes vore specific prefs breaking.
 2018-08-31 02:46:55 -05:00
Trilbyspaceclone
42c39d8908 Adv illegal ballistic Third times the charm? (#7426) 
* Adds in a new tec node

* Fixes it maybe hopefully?

* MESSES WITH E-SHOTGUNS
If the blaster shotgun is broke then blame me for this

* Perhaps properly adds in the node!

* Meh

* .dm remove

* boop

* NULL

* Readds the files 

missed re-adding them on my fork

* "

"

* Wait maybe if I try this it all works

It has nothing to do with anything and dose not even show me deleting

* Back to square one

...

* X to doubt 

[X]

* huh

* Look back at the past

Look were the error is

* Maybe that bolt action gun is messing with things

* hmm

* I know these two ammos are ok

* m45?

* m45?

* I must be doing this .45 ammo wrong

* Update pistol.dm

* Lets see

* Update all_nodes.dm

* Maybe?

* m9mm

* Lets try that

* so its linked correctly

* Update pistol.dm

* removes some spaces

* Revert "Testing code"
 2018-08-28 02:44:27 -07:00
deathride58
69e1cb5aea nerfs disablers, buffs tasers (#7507) 2018-08-28 02:41:01 -07:00
deathride58
5b933dcef4 Merge pull request #7482 from DravenPeace1/The_Open_Galaxy 
Open Galaxy
 2018-08-25 07:01:03 -04:00
Trilbyspaceclone
50ced97507 Buffs WT-550 (#7486) 2018-08-23 00:24:11 -07:00
DavenPeace1
2209f37a00 Open Galaxy 
🆑 Ah yes "Reapers"
add: Finally adds turians, but as a body marking, to have a better look, select the mammal, remove the snout and you won't have any weird looks, you can still add ears and tail, even taur body if anyone is "unique" enough to use it.

🆑 Scolipede, i choose you!!
add: Adds a new whole specie! Scolipede have snout, body marking, taur, tail and ears, for a more good look, try to find dark red colors to fit with it.

add: Added a bit news things, such as bee body marking, insect tail, fish tail and gills which is found in ears, horn for anyone that want to make a demoness or goat, added a tentacle tail, which i can see it will be mostly be used for slimes, the tentacle tail itself was an old sprite of citadel, i only brought back since i found a place to fit it, the real creator of the sprite will have the credit he/she deserves.

fix: Fixed the sprite bug of the octopus taur, it also had it name changed to tentacle
/🆑
 2018-08-21 00:02:58 -03:00
deathride58
0b029a914f Merge pull request #7456 from deathride58/donoritemfix482934985 
lets try to fix this donor item
 2018-08-20 04:55:24 -04:00
deathride58
1824fd39ae Merge pull request #7420 from Citadel-Station-13/kevinz000-patch-2 
Hypospray nerf: Normal ones only inject up to 10, cmo's injects up to 20
 2018-08-17 16:56:07 -04:00
slate
b3c888bc2e new emotes (#7467) 2018-08-17 12:41:36 -07:00
deathride58
332e3967f7 Merge pull request #7427 from Citadel-Station-13/kevinz000-patch-7 
borgis/scrubpups/medihounds aka standard/janitor/medical dogborgs now all have miniextinguishers
 2018-08-12 20:37:05 -04:00
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
LetterJay
626c5a018e Update __donator.dm 2018-08-05 20:14:52 -05:00
deathride58
2808425e7f Merge branch 'master' into kevinz000-patch-2 2018-08-04 00:10:09 -04:00
deathride58
2840a3f933 Merge pull request #7416 from Citadel-Station-13/kevinz000-patch-5 
halves hypospray times
 2018-08-04 00:09:05 -04:00
deathride58
d9c751114b Merge pull request #7417 from Citadel-Station-13/kevinz000-patch-6 
doubles hypovial storage
 2018-08-04 00:08:56 -04:00
deathride58
bbb5c1f6d5 Merge pull request #7432 from Citadel-Station-13/quickfix002 
Icon Fix
 2018-08-04 00:08:00 -04:00
deathride58
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
kevinz000
850eb21df9 Update robot_modules.dm 2018-08-01 16:43:47 -07:00
LetterJay
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
LetterJay
ce4da89cf1 Update custom_items.dm 2018-08-01 07:32:16 -05:00
LetterJay
7293bf85b5 Update custom_items.dm 2018-08-01 07:22:41 -05:00
LetterJay
e475970385 donate 2018-07-30 09:23:12 -05:00
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
kevinz000
7147d23c00 Update hypovial.dm 2018-07-29 17:10:33 -07:00
kevinz000
349eb64e53 Update hypovial.dm 2018-07-28 03:11:01 -07:00
kevinz000
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
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
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
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
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
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