deathride58
742d50b5e7
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into donoritemmodularization
...
# Conflicts:
# code/citadel/custom_loadout/custom_items.dm
# code/datums/components/riding.dm
# code/game/objects/items/implants/implantuplink.dm
# icons/mob/neck.dmi
# icons/obj/clothing/cloaks.dmi
2017-12-08 19:58:41 -05:00
deathride58
f75b36af75
Merge pull request #4176 from Michiyamenotehifunana/holy-crap-it-took-so-long-to-make-this-armor
...
Adds RGB knights and more!
2017-12-08 18:54:59 +00:00
LetterJay
828df6f12a
rreeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee
2017-12-05 07:14:48 -06:00
deathride58
0fc1837c3a
standardizes wearable donor icon names, fixes recent donor items not rendering properly
2017-12-04 20:23:15 -05:00
deathride58
f57e02ce95
Merge branch 'master' into donoritemmodularization
2017-12-04 20:17:02 -05:00
LetterJay
985c8ea86b
donation
2017-12-04 02:14:16 -06:00
LetterJay
03b7839e41
donation fix
2017-12-03 06:07:20 -06:00
Michiyamenotehifunana
867810ab8c
massive overhaul of RGB stuff and massive additions
...
halp
2017-12-02 00:06:42 +08:00
LetterJay
4b25b45701
donation
2017-11-30 07:49:42 -06:00
kevinz000
5d53a5dc75
Update cit_guns.dm
2017-11-24 12:50:46 -08:00
deathride58
751b61a9ab
Merge pull request #4065 from Poojawa/layering-memes
...
Edited breast sprites
2017-11-24 00:20:29 +00:00
LetterJay
eba36e48f9
Merge pull request #3984 from Citadel-Station-13/upstream-merge-32188
...
[MIRROR] JSON feedback
2017-11-22 18:42:34 -06:00
deathride58
60b2c25668
donator item modularization + manual sync of sprites upstream
2017-11-22 17:16:37 -05:00
Poojawa
33c1f85ff6
adjusts how boobs look sprite wise
...
No more sports bra tits.
2017-11-22 02:39:46 -06:00
deathride58
1f6b3ce629
Merge branch 'master' into upstream-merge-32188
2017-11-21 19:53:58 +00:00
kevinz000
93592ca4ab
Update cit_guns.dm
2017-11-20 16:46:20 -08:00
Michiyamenotehifunana
de05bd6896
no moar infinite metal
2017-11-19 16:57:47 +08:00
deathride58
eeba86e27e
Merge branch 'master' into upstream-merge-32188
2017-11-18 05:31:42 +00:00
deathride58
c98faf5bb5
Update _cit_helpers.dm
2017-11-18 00:23:19 -05:00
deathride58
bb690b24ba
Update cit_crewobjectives_science.dm
2017-11-17 23:45:20 -05:00
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
