Commit Graph

334 Commits

Author SHA1 Message Date
Poojawa
b00a76476c Oh hey, all of those compile fixes 2018-09-11 11:00:18 -05:00
Poojawa
afac3ae0ab Merge branch 'master' into changelog-memes 2018-09-11 07:52:59 -05:00
Poojawa
284e9d0325 module things, jfc 2018-09-11 07:51:01 -05:00
Poojawa
b6430559e9 datums 2018-09-11 02:49:41 -05:00
deathride58
705aa7d2e8 Merge pull request #7558 from GuppyLaxx/seamen
*jerks
2018-09-10 18:55:55 -04:00
Poojawa
7a8c76d9cb Update dogborg_equipment.dm 2018-09-08 20:07:44 -05:00
guppylaxx
dedb703d0a fuck2 2018-09-07 16:21:12 -04:00
guppylaxx
9c820743d5 fuck 2018-09-07 16:18:40 -04:00
Poojawa
3838a4bd95 Adds intercoms to fetch module blacklist
smh, should probably be an anchored check as well, but who the fuck knows how to make that work with component memes
2018-09-07 13:40:06 -05:00
deathride58
b89203acc7 reduces stam buffer regen time to 1 second (#7504) 2018-09-07 07:26:29 -07:00
deathride58
f2978d542e Merge pull request #7532 from Trilbyspaceclone/patch-20
Fixing placement and nerfing of Adv Illegal node
2018-09-06 13:33:48 -04:00
deathride58
bb359e78d4 Merge pull request #7516 from izzyinbox/electrostim-circuit-part
Adds electro-stimulation integrated circuit part
2018-09-06 13:31:38 -04:00
deathride58
af97633db5 Merge pull request #7517 from Poojawa/rusty_vore
Forces Vore prefs to use rust_g
2018-09-03 13:46:59 -04:00
deathride58
d3c116d1a0 Merge pull request #7518 from Poojawa/cit_pref_issues
Fixes Cit_toggles by sanitizing it with less autism
2018-09-03 13:44:16 -04:00
izzy
14be1a02d9 adds better chat messages and sound, lowers power draw 2018-09-03 11:52:04 -05:00
Trilbyspaceclone
9b30150571 Fixing placement and nerfing of Adv Illegal node 2018-09-03 02:32:04 -04:00
Poojawa
1975c74efb Fixes Cit_toggles by sanitizing it with less autism
how the fuck did it never go from toggles -> cit_toggles I haven't a
clue
2018-08-31 03:11:41 -05:00
Poojawa
3ffdfb5bee Forces Vore prefs to use rust_g
This probably fixes vore specific prefs breaking.
2018-08-31 02:46:55 -05:00
izzy
1eb7c176d6 add electric_stimulator integrated circuit part 2018-08-30 05:45:33 -05:00
Poojawa
c22d1cacb8 Adds *insult 2018-08-29 03:25:27 -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