Commit Graph
835 Commits
Author SHA1 Message Date
Poojawa 786ddc4694 icons 2018-03-06 21:46:57 -06:00
CitadelStationBotandPoojawa 534c4fcc18 [MIRROR] Space Parallax Tweak (#5806)
* Space Parallax Tweak (#36137)

* Tweaked contrasts

Upped the contrast on layer 1.
Tweaked the saturation to layer 2.

* more saturation and contrast

* tweak

* .

* Revert "."

This reverts commit 9590c657bac2c3afed007c82a7d05d36fd4249a6.

* Revert "Revert ".""

This reverts commit 6b9adf4d3fc13d6d3d934cc3eb9ea464c432c414.

* polish

* DO YOU SEE?

* Space Parallax Tweak
2018-03-06 12:28:22 -06:00
PoojawaandGitHub 54e33374d2 Hypospray MK IIs (#5722)
* Initial commit

* most of the work down

itfinallycompiled

* tweaks

* ree

* fixes bad attempt at mode switching

* slight sprite tweak to give vials better clickability.

* can I has real review now pls thx Bhijn

* pre-emptively avoiding a troll 'review'

* WEH

* trying to code new functions is dumb

* reeeeee

put_in_hand doesn't exist apparently

and the shitty thing wants me to select mobs, not modes?

* ya lemmie just, rewrite everything

* fixes adaptation issues and sprites. Loading/unloading works

Now just to figure out reagent transfer_to code. aaaaaaaaaAAAAAAAAAAAAAAAAAAAAAAA

* HAHAHA YES

* Fully working with sounds and all.

* remove a testy boi
2018-03-06 03:56:19 -06:00
CitadelStationBotandPoojawa a2e6253f00 [MIRROR] Disease antagonist (#5815)
* Disease antagonist

* Update mobs.dm

* can I go to sleep yet
2018-03-05 15:20:59 -06:00
vuonojenmustaturskaandCitadelStationBot e849ab23aa Advanced roasting sticks, for cooking sausages (#36071)
* stick

* a commit

* almost forgot something

* seems to compile
2018-03-04 15:41:23 -06:00
PoojawaandGitHub 61b121a4c9 Dogborg fixes, Borg construction animations! (#5725)
* major re-works

* Resting verb in, but the icons don't refresh correctly

* tweaks self heal for engiborgs

* minor fixes

* Fixes borg animation flicker

* ore pup stuff, maybe.

* tweaks from upstream input

* adds the basically useless check for dogborg specific modules

* cleans up code and Scrubpup Animation!

* Update robot_modules.dm
2018-03-04 11:53:48 -06:00
LetterJayandGitHub 4c6dbcc85a Merge pull request #5770 from Citadel-Station-13/upstream-merge-36046
[MIRROR] Dice icon name and desc change
2018-03-03 02:46:35 -06:00
SlignerdandCitadelStationBot fa81e27676 d (#36046)
Dice icon name and desc change
2018-03-03 00:31:35 -06:00
Tad HardestyandCitadelStationBot 8fe572acde Merge pull request #36054 from AutomaticFrenzy/patch/fancy-tables-2
Fix placement of fancy tables in the editor
2018-03-03 00:31:27 -06:00
CitadelStationBotandPoojawa 8543df055d [MIRROR] Add parallax sprites from RIS (#5749)
* Add parallax sprites from RIS (#36049)

* Add files via upload

* Update parallax.dm

* Add parallax sprites from RIS
2018-03-02 18:35:35 -06:00
CitadelStationBotandPoojawa a53e395606 [MIRROR] Tesla Corona Analyzers (#5726)
* Tesla Corona Analyzers (#35965)

* Tesla Corona Analyzers

Generate points to make up for no bomb production on maps like Pubby

* Silly me, not Aurora, but Corona

* Adds sprites to the new mode

* new sprites! credit to... me!

* Further sprite tweaks.

* Tesla Corona Analyzers
2018-02-27 07:41:38 -06:00
MMMiraclesandCitadelStationBot 5493339c7d Adds Tinfoil Hats (#35665)
* adds a tinfoil hat to protect you from government conspiracies and aliens

* qutoes ples

* In the sheets of my sterilized room
In your comfy bed, air-conditioned car
There are vapors and toxins to get you all
In the water you drink, in the air that you breath
In the soil under your shoe

* conspiracy phobia, nodrop on hat once equipped, also CONTRAST

* a single comma

* cyberboss changes

* |=

* central typo fix
2018-02-25 18:11:48 -06:00
CitadelStationBotandPoojawa b2ea3ea668 [MIRROR] Fixes cats growing collars when resting (#5688)
* Merge pull request #35926 from ShizCalev/cat-collar-fix

Fixes cats growing collars when resting

* Fixes cats growing collars when resting
2018-02-24 06:25:43 -06:00
PoojawaandGitHub ab8ccef9b8 Missing drink icon from #5681 2018-02-24 06:13:17 -06:00
CitadelStationBotandPoojawa 3c7520f1f1 [MIRROR] Makes light fixtures actually glow in the dark while on (And adds the necessary groundwork for other above lighting plane stuff) (#5687)
* Makes light fixtures actually glow in the dark while on (And adds the necessary groundwork for other above lighting plane stuff) (#35879)

* adds an above lighting layer, adds lighting overlays

* fixes wonkiness with broken and burned lights

* decreases overlay alpha a tad bit

* i gotta test this - removes new() override from mutable_appearance

* readds /mutable_appearance/New() for legacy behaviour

* Makes light fixtures actually glow in the dark while on (And adds the necessary groundwork for other above lighting plane stuff)
2018-02-24 06:08:23 -06:00
CitadelStationBotandPoojawa d96b280383 [MIRROR] Adds an dart-synthesizing dartgun for CMO/Chemist traitors (#5672)
* Adds an dart-synthesizing dartgun for CMO/Chemist traitors (#35906)

* Syringe dartguns!

* Fix wording

* And then I said, 'I fixed it all!'

* Make it 12TC

* Adds an dart-synthesizing dartgun for CMO/Chemist traitors
2018-02-23 17:42:03 -06:00
CitadelStationBotandPoojawa 23b98e4e52 [MIRROR] Holopads have a special animation for an unanswered incoming call (#5644)
* Holopads have a special animation for an unanswered incoming call (#35391)

* Holopads have a special animation for an unanswered incoming call

🆑 coiax
add: Holopads now flash a green line when there is an incoming call.
/🆑

* Holopads have a special animation for an unanswered incoming call
2018-02-21 19:48:10 -06:00
CitadelStationBotandPoojawa 359a500e79 [MIRROR] New Donkpocket Box (#5641)
* New Donkpocket Box (#35835)

cl Jittai / ChuckTheSheep
imageadd: NT has stopped buying re-boxed storebrand Donkpockets and now stocks stations with real, genuine, tasty Donkpockets!
/cl

RIP: #35601
I was asked to throw together some icons for donk baggies, but had some fun making the box.

* New Donkpocket Box
2018-02-21 19:45:23 -06:00
CitadelStationBotandPoojawa 03dfbe7137 [MIRROR] Ports Barometers from Yogstation (#5647)
* Ports Barometers from Yogstation (#35730)

* Ports Barometers from Yogstation

* Ports Barometers from Yogstation

* Added missing barometer_predictable bools

* Gives the atmos analyzer love instead of a new item.

* Moves playsound under cooldown to prevent soundspam.

* Ports Barometers from Yogstation
2018-02-21 19:44:20 -06:00
fludd12andCitadelStationBot 0d03e90e9f Fixes mushroom bowls (#35740)
* Fixes mushroom bowls

Made the mushroom bowl a subtype of the normal bowl, and deleted a
duplicate definition.

Also, adds custom soup and salad support for the mushroom bowls.

Fixes #32471

* Remove a dangling return
2018-02-19 22:08:09 -06:00
deathride58andGitHub fef23bd7cc Merge pull request #5594 from Poojawa/Tweaks
fixes possible missing sprites
2018-02-20 03:37:39 +00:00
Poojawa 91c9434404 fixes possible missing sprites 2018-02-19 20:03:02 -06:00
CitadelStationBotandPoojawa 5a532dd606 [MIRROR] Sheet icon fixes (#5585)
* Sheet icon fixes

* Update sheet_types.dm
2018-02-19 10:21:32 -06:00
LetterJayandPoojawa 8483f94d5f Blood Red Tie - Donator Loadout (#5579)
* donation item

* path cleanup

* ditto

* Update __donator.dm
2018-02-18 19:37:10 -06:00
fludd12andPoojawa 954bb7330e Sake! (#5538)
* Sake!

🆑 Fel and LeonDuvall
add: You can now drink sake! Can be found in the bar, or made with rice
and sugar.
/🆑

Sprites and idea courtesy of LeonDuvall.
Can be made with 15u rice and 5u sugar at 400k.

* Does the thing

Modularization of vending machines would require a lot more effort than
is remotely worth for such a simple change. Fortunately, not a lot of
new alcohols are added to it often, so it should be fine.
2018-02-18 19:26:55 -06:00
deathride58andGitHub f35f20b0a1 Merge pull request #5563 from Citadel-Station-13/upstream-merge-35764
[MIRROR] RPED and crew pinpointer module upgrades for engi/medical borgs
2018-02-18 23:28:13 +00:00
vuonojenmustaturskaandCitadelStationBot d4eab2acae borgmods 2018-02-18 11:33:12 -06:00
Poojawa d2d1315b13 fixes shepards, adjusts fox markings 2018-02-18 06:41:14 -06:00
Poojawa 3255bfbdbf sergal head stuffs
husky markings too
2018-02-18 04:48:02 -06:00
PoojawaandGitHub 7d488e8f4c Citadel'd Maps from #5523 (#5551)
* #5523 commit + sanity upload

* reee

* Syncs home brew CItadel changes

* updates cit_map_files

* reee.
2018-02-17 18:04:28 -06:00
deathride58andGitHub 5374724165 Merge pull request #5535 from Citadel-Station-13/upstream-merge-35707
[MIRROR] Adds rainbow slime clusterbangs
2018-02-17 19:31:20 +00:00
LetterJayandGitHub e809725afd Merge pull request #5525 from jakeramsay007/slimepeoplerework
[Ready!] The Slimening - Reworking slimepeople to be less like humans without unbalanced advantages.
2018-02-17 11:51:45 -06:00
BordListianandCitadelStationBot 24ab7e0a84 Adds rainbow slime clusterbangs (#35707)
* - slime
- yes

* - Adds a volatile reaction

* - There is no escape from the standards that live within
- Can't wait for the experimentor review
2018-02-17 00:47:03 -06:00
Chayse Ramsay 29bdef8664 New UI icon 2018-02-16 21:14:55 +00:00
SlignerdandCitadelStationBot cbe4734216 Changes a number of HUD icons (#35704)
* Updates hud.dmi

* Makes clown's nose big again

* Updates contraband balloons

* Changes HUD icons and HUD-themed balloons
2018-02-16 10:34:45 -06:00
Chayse Ramsay 482c21b296 Slimepeople Rework 2018-02-16 12:44:23 +00:00
deathride58andGitHub c1b3253b8d Merge pull request #5485 from Poojawa/cryopods
Cryopods from Oracle Station
2018-02-16 05:56:34 +00:00
deathride58andGitHub d7c06fec6f Merge pull request #5505 from Citadel-Station-13/upstream-merge-35342
[MIRROR] Adds Cryostatis Shotgun Darts
2018-02-16 01:29:14 +00:00
MMMiraclesandCitadelStationBot bd9ad82bbf Adds Cryostatis Shotgun Darts (#35342)
* adds cryostatis shotgun darts, because shooting tiny water+potassium bombs into people is funny

* lowers amount from 15 to 10

* Update ammo_casings.dm
2018-02-15 14:25:05 -06:00
TehZombehzandCitadelStationBot 326238e59f Gives eggbox an inhand image, cleans up heartbox inhands 2018-02-15 14:23:48 -06:00
Poojawa 01bc7310b6 Cryopods from Oracle Station
It's really nice to have a tg based station that's porting good shit.
2018-02-14 14:06:33 -06:00
orangesandCitadelStationBot e6ace7bc56 Adds heart-shaped boxes of chocolate to the valentines event 2018-02-13 14:12:32 -06:00
Dax DupontandCitadelStationBot 789bf29661 Adds tada emoji (#35560) 2018-02-13 05:40:32 -06:00
RobustinandCitadelStationBot 1825c944b6 Cult Update? Cult Update! (#35433)
* Cult Fixes and Tweaks

* Master prompt and spelling fix

* Couple small fixes
2018-02-12 15:18:21 -06:00
MoreRobustThanYouandCitadelStationBot 37a1f6245d Fix SCP-294 appearance (#35528)
* Add files via upload

* Add files via upload
2018-02-12 12:50:12 -06:00
deathride58andGitHub 081f7d3cbe Merge pull request #5408 from Michiyamenotehifunana/magrifle-fix
Fixes and Reimplements Magnetic Weapons
2018-02-11 23:34:45 +00:00
MoreRobustThanYouandCitadelStationBot 6337c294d9 Makes urinal cakes more realistic (#35515)
* Add files via upload

* Makes urinal cakes blue

* Add files via upload

* Delete urinalcake_squish.png
2018-02-11 15:29:47 -06:00
CitadelStationBotandGitHub 74c083fc89 Merge pull request #5416 from Citadel-Station-13/upstream-merge-35188
[MIRROR] Adds a SCP-294 ruin
2018-02-11 07:38:37 -06:00
MoreRobustThanYouandCitadelStationBot 73c1088d5a Adds a SCP-294 ruin 2018-02-11 05:13:56 -06:00
uraniummeltdownandCitadelStationBot e3ec8a648a Buildable Shuttle/Plastitanium Windows (#35376)
* use titanium/plastitanium on unanchored reinforced fulltile window to make shuttle/plastitanium windows

* updates titanium/plastitanium sprites, adds titanium glass and plastitanium glass, fixes material amount in mineral glass
2018-02-11 05:13:37 -06:00