Commit Graph

303 Commits

Author SHA1 Message Date
Jordan Brown
d615ecb340 Merge pull request #32223 from Mercenaryblue/Clown_Box_Sprite
Updated clownbox sprite to better match others.
2017-10-30 14:35:17 -05: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
Mercenaryblue
819244575d Spooky Spectral Instruments (#31966)
* [dooting intensifies]

Spectral Instruments added
To be used with Spooky Skeletons.

* Spectral Re-balance

The spectral instruments no longer stun living creatures.
Text make you retain your loyalties now.

* Requested Changes

Added variable "too_spooky".
Defines if it will spawn a new instrument.
Re-balanced damage to 5 hits average per conversion.
Added admin notice to changelog.

* Loyalty text fix

* Spooky Trumpets

Removed comment.
Added missing spookiness.

* Spooky Dooting

Major Overhaul.

removed /brass/
Spooky Dooting is now a component.
Boneless humanoids no longer lose stamina.

* Spooky Dooting

mk2
2017-10-29 07:35:16 -05: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
deathride58
36f1aebdb5 hard sync of sprites files missing in #3606 2017-10-27 17:23:44 -04:00
LetterJay
a5338759b7 donation item 2017-10-27 13:06:53 -05:00
LetterJay
bdc81de1c5 Merge pull request #3610 from Citadel-Station-13/upstream-merge-31954
[MIRROR] Changed chemical heater and smoke machine sprites
2017-10-26 16:54:33 -04:00
nicbn
23871f7643 1 2017-10-25 23:36:03 -05:00
Emmett Gaines
ae86a75362 Greyscale cables 2017-10-25 21:46:57 -05: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
LetterJay
14ed0d84e8 kill-me 2017-10-24 11:57:08 -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
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
CitadelStationBot
46a78bc3dd [MIRROR] Reverts bluespace pipes (#3513)
* Revert bluespace pipes while keeping fixes from the original PR (#31866)

These are absurdely overpowered given that they have no research or
material gate

* Reverts bluespace pipes
2017-10-20 01:40:15 -05:00
LetterJay
a1643221aa Merge pull request #3498 from Citadel-Station-13/upstream-merge-31751
[MIRROR] Adds radiation goggles and a small rewrite to make adding more view modes in the future easier
2017-10-19 09:14:13 -04: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
Emmett Gaines
28f3bc0918 Adds radiation goggles and a small rewrite to make adding more view modes in the future easier (#31751)
* adds radiation goggles

* cleanup
2017-10-19 02:54:23 -05:00
duncathan salt
c813d16a97 update layer manifold sprite (#31857)
* update layer manifold sprite

* update layer manifold pipe item sprite
2017-10-18 22:03:05 -05:00
LetterJay
02fcc06eb1 missing item state 2017-10-18 20:56:51 -05:00
LetterJay
5760fbfc2f MORE CUSTOM ITEMS 2017-10-18 08:07:31 -05:00
Robustin
d8ab924b72 Smoke Machine Fixes (#31806) 2017-10-17 12:34:28 -05:00
LetterJay
875d805403 Merge pull request #3457 from Citadel-Station-13/CWCIcons
Fixes missing CWC icons
2017-10-17 10:00:12 -04:00
LetterJay
7cf4b3b26c Fixes missing CWC icons 2017-10-17 07:51:15 -05:00
kevinz000
a41725a955 Atmospherics Multilayer Pipes (#30972)
* 1

* rpd

* 3

* 4

* 5

* 6

* 7

* 8

* wew

* src. and underlays

* update

* woops

* misspelled params

* reviews

* fixes

* fixes

* better checks and layer crap

* Update RPD.dm

* Update pipe_construction.dm

* 3 layers, fixes

* woops i didn't update defines correctly

* dunc

* Fixes

* Fixes

* fixes

* fixes some more bullshit

* fixes

* fixes

* not needed

* makes attachment sprites prettier or uglier i dunno

* Unary flag

* sprite fix??

* fixes...

* sprite fixes
2017-10-17 00:49:12 -05:00
LetterJay
1c807d8bb8 donation item 2017-10-16 16:45:33 -05:00
LetterJay
24631746d4 Merge pull request #3414 from Citadel-Station-13/upstream-merge-31707
[MIRROR] Restores security bombsuit & white bombsuit
2017-10-16 14:12:28 -04:00
LetterJay
531294c67b icons 2017-10-16 11:40:06 -05:00
LetterJay
568ed91f28 Merge pull request #3430 from Citadel-Station-13/upstream-merge-30599
[MIRROR] Moves projectile processing to a subsystem
2017-10-16 10:39:41 -04:00
LetterJay
ea4d097650 Merge pull request #3427 from Citadel-Station-13/upstream-merge-31719
[MIRROR] (s) Fixes invisible sink & urinal exploit
2017-10-16 07:29:11 -04:00
LetterJay
7824c58539 Merge pull request #3418 from Citadel-Station-13/upstream-merge-31728
[MIRROR] Sunflower makeover, adds missing inhands sprites.
2017-10-16 07:27:31 -04:00
kevinz000
ed96224d3a Moves projectile processing to a subsystem 2017-10-15 21:51:24 -05:00
ShizCalev
de46571eb6 Fixes invisible sink & urinal exploit (#31719) 2017-10-15 21:00:49 -05:00
Mercenaryblue
3690fc56c2 Honkbots: The Clown's lil helpers. (#31139)
* Honkbots 0.9.0

Old code, needs testing.

* Honkbots 0.9.1

Small Fixes - Part 1

* Honkbot 0.9.1b

Fixes

* Honkbots 0.9.2

Added sound cooldown, fixes.

* Honkbots 0.9.5

Clown Box & Honkbot Assembly Code

* 0.9.5.a

oops

* Honkbots 1.0.0

Final touches and fixes.
Clown Box finished.
Assembly functioning.
Honkbots tested and ready to go.
Its time.

* Honkbots 1.0.1

Initialize and . = ..()

* Honkbots 1.0.2

Fixes and Changes
====
Nerfed Brute/Thermal Resist
Buffed Health (to avoid 1-shot)
Added HONK_BOT define

* Honkbots 1.0.3

Removed the cardboard assembly from death gibs.
Admin Bwoink removed from emagged soundtrack.
Honkbot now release an evil laugh when emagged.
Fixed strange behaviors on emagged level 1
Added a check against stamping multiple cardboard sheets.
Stamping a Clown Box now plays the bike horn, once.
Clown Boxes no longer get automatically placed in hands.
Various other fixes.

* Honkbots 1.0.3a

* Honkbots 1.0.3.b

Fixes.

* Honkbots 1.0.4

*Added an emote ping upon assembly creation.
*Enabled either Theatre or Robotics for access. ((fixing needing both))
*Honkbots are now more forgiving after being hit.
**Airhorn stun_attack now deals slight ear damage, for about 5 seconds.
**Cardboard no longer drops upon death. Robot arms have 50% chance.
**Using a new get_sfx() list when emagged.
**Optimization and other minor fixes.

* Honkbots 1.0.4.a

Missed it.

* Honkbots 1.0.4.b

use(1) and (client)

* Honkbots 1.0.4.c

Moved proc

* Honkbots 1.0.5

*Code Optimization
*Renaming w/ Pen (how could I even forget this)
*Assembly Defines

I'm afraid I'm simply out of my depth with the suggested use(1) rework.

* Honkbots 1.0.5.c

Reworked cardboard stamping.

It now works in the hands and on the ground, either solo or in stacks, and prevent itself being used in backpacks.

* Honkbots 1.0.5.d

Final

* Honkbots 1.0.5.e

comment

* 1.0.5.f

Optimization

* Honkbots 1.0.5.g

Missed requested stuff

* Honkbots 1.0.6

Requested changes.

* Honkbots 1.0.6a

Oops.

* Honkbots 1.0.6.c

Bugfix - Prevent building in backpacks.
Make sure they spawn on turf.

* Honkbots 1.0.7

one less spawn(0)
flag optimization
else return ..()

* Honkbots 1.0.7.a

Get rids of a lot of client checks at the cost of automatic AI retoration.

* Honkbots 1.0.7.b

Added judgment_criteria()
changed assess_threat to use judgment

* Honkbots 1.0.7.c

final = NONE
2017-10-15 16:44:23 -05:00
Onule
5bdadb7d4e Sunflower makeover, adds missing inhands sprites. (#31728)
* New sunflower sprite, added inhand sprites, first time messing with git

* Updates sunflower and variant's sprites, adds new growing stage sprites for sunflower variants, new inhands sprites.

* Made the leaves a bit higher. Das it
2017-10-15 16:34:01 -05:00
LetterJay
87e8c66d5f Merge pull request #3378 from Citadel-Station-13/upstream-merge-31649
[MIRROR] Fixes invisible wirecutters and made screwdrivers easier to see in DM
2017-10-14 10:21:27 -04:00
LetterJay
dce56e3951 Merge pull request #3376 from Citadel-Station-13/upstream-merge-31598
[MIRROR] Smoke Machine Updates & Fixes
2017-10-14 10:21:09 -04:00
ShizCalev
ac660b6e3e Invisible wirecutters and made screwdrivers hivis (#31649) 2017-10-13 18:35:58 -05:00
Robustin
4100473aba Smoke Machine Updates & Fixes (#31598)
* Smoke Machine Update

* Update smoke_machine.dm

* Compiling again
2017-10-13 16:50:32 -05:00
Lexorion
f78a955bb7 Adds new sabre sprites 2017-10-13 11:54:37 -05:00
WJohn
b2bcc4a6ba Fixes black carpet sprite, and gives catwalks a super transparent layer of opacity. (#31558) 2017-10-12 12:36:56 -05:00
LetterJay
5b4e26cb06 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2017-10-11 08:06:03 -05:00
LetterJay
a75362cecc COLLAR 2017-10-11 08:05:49 -05:00
Robustin
a570ec8610 Adds the Chemistry Smoke Machine (#30920)
* Smoke Machine

* Tweak

* More responsive smoke timing

* Antur Review and Admin Logs

* Cboss review

* More logging

* Removes analyze, streamlines logs

* r-e-a

* no s in reagents_list

* Cyberboss Review

* woops

* Cboss nitpicking
2017-10-10 13:13:38 -05:00
Dax Dupont
f62337b4c6 Fixes the pinpointer icons for west facing medium arrow (#31478) 2017-10-09 19:07:35 -05:00
LetterJay
86edafb132 lol 2017-10-09 01:06:50 -05:00
oranges
ad39e816f4 Settles the sabre/rapier debate once and for all 2017-10-08 01:03:42 -05:00
LetterJay
2acc990425 donation items / framework for some 2017-10-07 23:27:25 -05:00
LetterJay
edce74eb51 Merge pull request #3179 from Michiyamenotehifunana/toyguns
Adds more toy guns
2017-10-07 01:04:03 -04:00