Commit Graph

323 Commits

Author SHA1 Message Date
LetterJay
cd9bab3052 Merge pull request #3799 from deathride58/furtherboxedits
Boxstation Edits: Legless Warden edition
2017-11-04 22:50:58 -05:00
deathride58
1c38ebd9e4 tons of map changes to go around 2017-11-04 00:55:56 -04:00
Michiyamenotehifunana
6446b7f126 Security Skirts and more! 2017-11-04 10:22:45 +08:00
Michiyamenotehifunana
d7e0857716 Polishes code for recolorable assets
Moves things around a bit to hopefully be more optimized and have lower chance of breaking
2017-11-01 23:33:24 +08:00
LetterJay
d5aa1caca8 Merge pull request #3715 from Michiyamenotehifunana/misc-bug-fixes
Fixes Mk.37Fs needing permits and Toy NEBs being able to turn into Dual Toyswords
2017-11-01 01:40:20 -04:00
LetterJay
fec29755ad Merge pull request #3714 from Michiyamenotehifunana/rebalancing-excessive-nerfs
Further rebalancing of Cit_guns projectiles
2017-11-01 01:40:08 -04:00
Michiyamenotehifunana
e0a153c4c7 9mm frangibles now requires hacked lathes, costs slightly less
They are by all means, lethal, even if they absolutely pale in comparison to regular bullets. They'll cost ever so slightly less materials to build.
2017-10-31 19:47:20 +08:00
Michiyamenotehifunana
f25c1b5cce CRITICAL FIX FOR EXPLODING TOYS
OH GOD THIS IS SUCH A HILLARIOUS OVERSIGHT
2017-10-31 19:00:04 +08:00
Michiyamenotehifunana
beb27926b2 Fixes Cit's Toys a little
Mk.37F no longer needs a permit, Non euplastic blade no longer can turn into dual toyswords
2017-10-31 18:00:45 +08:00
Michiyamenotehifunana
068976c971 Rebalances citprojectiles somewhat
Magjectiles have had their speed and range nerfed by about 50%, non lethal 9mms have lower speed and drastically lower range.
2017-10-31 16:37:09 +08:00
Michiyamenotehifunana
9ea376dc81 fixes soporifics having the old two shot value
SSSSSH JUST PRETEND IT WAS A MISTAKE
2017-10-30 17:33:01 +08:00
Michiyamenotehifunana
d0a28fcd62 NERF EVERYTHING
EVERYTHING OP NERF NOW also what the fuck how does a whole playerbase ignore balance issues for a whole fucking month only for a vilified member of the community to be so fucking helpful
2017-10-30 15:01:37 +08:00
LetterJay
1fe4eb7d88 Merge pull request #3508 from Michiyamenotehifunana/recolorable-guns
Recolorable Guns and more ballistics for Security
2017-10-29 23:43:20 -04:00
LetterJay
2b65d6f0cc Merge pull request #3665 from deathride58/fixescrewobjredtext
Fixes certain crew objectives giving out red text
2017-10-29 04:23:35 -04:00
LetterJay
2503a90dc0 Merge pull request #3585 from Michiyamenotehifunana/CX-sword
Adds fancy Energy Swords (and a toy version)
2017-10-29 03:56:27 -04:00
LetterJay
e150fe28b6 Merge branch 'master' into upstream-merge-31877 2017-10-28 23:57:51 -04:00
deathride58
30514ff9c2 Revert "Revert "schrondinger's paranoia fix, also check_contents_for doesnt support lists""
This reverts commit 663d01702d.
2017-10-28 02:20:43 -04:00
deathride58
663d01702d Revert "schrondinger's paranoia fix, also check_contents_for doesnt support lists"
This reverts commit b83be3feae.
2017-10-28 02:20:29 -04:00
deathride58
b83be3feae schrondinger's paranoia fix, also check_contents_for doesnt support lists 2017-10-28 02:12:53 -04:00
LetterJay
2d8468aed0 Update _cit_helpers.dm 2017-10-28 00:23:25 -05:00
LetterJay
a5338759b7 donation item 2017-10-27 13:06:53 -05:00
deathride58
df3c60bce5 drunk coding is a horrible idea 2017-10-26 22:54:49 -04:00
Michiyamenotehifunana
54a51a2fdb NEB Polishing
Toys now implemented in a better way, new sound effects, and new traitor variant.
2017-10-25 16:36:03 +08:00
deathride58
a664384e81 Bhijn's touching dogborg balance again everyone panic (#3432)
* rebuffs everything and puts babyproof locks on scrubpup compactor

* lets it compile, removes things from the blacklist

* readds telegraphing due to popular vote, removes flash from scrubpups

* does githubs text editor work for basic thing on mobile

* reverts blacklist changes

* keeps spoolup, removes sounds + anime prepounce effects
2017-10-24 22:04:51 -05:00
LetterJay
14ed0d84e8 kill-me 2017-10-24 11:57:08 -05:00
LetterJay
cb30805b04 Update custom_items.dm 2017-10-24 11:25:30 -05:00
Michiyamenotehifunana
33f2597e56 Adds Non-Eutactic Blades (eswords that look like swords)
Includes tator tot version and toy version, made in the autolathe because I suck. They're recolorable.
2017-10-24 19:35:26 +08:00
LetterJay
95cb834389 dupe item state for donation item 2017-10-23 23:34:15 -05:00
Michiyamenotehifunana
c7cf49ec6f Revamps the recolor system of the Mk.37, gives variants appropriate firing pins, and adds a minor outline to the Model D sprite
Mk.37P now has the Judge Dredd pin, S now has loyalty pins. P's description updated with a warning. Model D has slightly tweaked sprites. Recolor menu for Mk.37P is now less spammy.
2017-10-23 18:11:16 +08:00
LetterJay
05e1efd020 Merge pull request #3529 from Michiyamenotehifunana/nerf-nerfs
Nerfs Autolathed Foam Guns
2017-10-22 12:18:35 -04:00
Poojawa
7b8e88ec7e Medihound Fixes (#3462)
* fix borgs, tries new things

* TGUI experiment, Expanded resist

also cleans up some bad code we don't want to keep

* kinda important to have the right one

* I actually managed to compile tgui

* tgui fuckery

I hate UI building

* more tgui tweaks

and it finally compiles, again.

* Have I mentioned UIs are not my strong point?

Because they're really not

* updates to this shit thing.

Tgui button chem selection -> chem to inject needs to be fixed

* No.

* FUCKING, FINALLY
2017-10-21 06:15:50 -05:00
Michiyamenotehifunana
b34a10396a Model D is now disabler/kill only and has more obvious inhands
Now it's even more obvious than the regular egun's inhands and just has disabler/kill instead of stun/kill.
2017-10-21 13:30:04 +08:00
Michiyamenotehifunana
f41c8ccccf Nerfs nerfs
NO MORE INSTANT BAGGABLE STUNS FROM AUTOLATHES!
2017-10-21 11:43:41 +08:00
Michiyamenotehifunana
d62ddf181b Adds inhands for the Model D
They follow the same color as the regular sprite!
2017-10-20 23:10:22 +08:00
Michiyamenotehifunana
165ee70549 Removed disablers from the Model D
So that it isn't another lame HoS/Tac egun clone (although the Tac egun can fire twice the amount of tasers) and also puts it in line with the ALP of an era long gone.
2017-10-19 20:45:02 +08:00
Michiyamenotehifunana
5071b3438c RECOLORABLE GUN MEMES
Includes new ammo types, recolorable guns, partially recolorable guns, non-recolorable guns, and implementations into the map.
2017-10-19 18:30:44 +08:00
LetterJay
d85dfb4aed i hate it all 2017-10-18 20:41:38 -05:00
LetterJay
fa7bbd50e5 fuck 2017-10-18 15:25:33 -05:00
LetterJay
8eb325ba1f icon 2017-10-18 15:15:47 -05:00
LetterJay
215681a23e AHHHHHHHHHHH 2017-10-18 08:10:12 -05:00
LetterJay
5760fbfc2f MORE CUSTOM ITEMS 2017-10-18 08:07:31 -05:00
LetterJay
cc96777b6b wrong filepath 2017-10-16 16:46:02 -05:00
LetterJay
1c807d8bb8 donation item 2017-10-16 16:45:33 -05:00
LetterJay
7feae419a1 Merge pull request #3421 from deathride58/consensualaphro
Make Crocin and Hexacrocin require arousal to be on to have lewd effects
2017-10-16 10:39:50 -04:00
deathride58
9799fb071a tfw autotab 2017-10-15 19:28:03 -04:00
deathride58
0cdf695c42 makes crocin and hexacrocin require arousal to be on to have an effect 2017-10-15 19:19:43 -04:00
deathride58
dc7f43d72c lets it actually compile 2017-10-15 02:16:13 -04:00
deathride58
bc12f646ed adds sounds to dogborg pounce 2017-10-15 02:10:01 -04:00
deathride58
d6d9c1e1a8 bluh 2017-10-15 01:01:20 -04:00
deathride58
38d139205d wooooooork 2017-10-15 00:53:35 -04:00