Commit Graph

436 Commits

Author SHA1 Message Date
CitadelStationBot
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
CitadelStationBot
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
fludd12
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
CitadelStationBot
5a532dd606 [MIRROR] Sheet icon fixes (#5585)
* Sheet icon fixes

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

* path cleanup

* ditto

* Update __donator.dm
2018-02-18 19:37:10 -06:00
fludd12
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
vuonojenmustaturska
d4eab2acae borgmods 2018-02-18 11:33:12 -06:00
deathride58
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
BordListian
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
Slignerd
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
deathride58
c1b3253b8d Merge pull request #5485 from Poojawa/cryopods
Cryopods from Oracle Station
2018-02-16 05:56:34 +00:00
deathride58
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
MMMiracles
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
TehZombehz
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
oranges
e6ace7bc56 Adds heart-shaped boxes of chocolate to the valentines event 2018-02-13 14:12:32 -06:00
Robustin
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
MoreRobustThanYou
37a1f6245d Fix SCP-294 appearance (#35528)
* Add files via upload

* Add files via upload
2018-02-12 12:50:12 -06:00
deathride58
081f7d3cbe Merge pull request #5408 from Michiyamenotehifunana/magrifle-fix
Fixes and Reimplements Magnetic Weapons
2018-02-11 23:34:45 +00:00
MoreRobustThanYou
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
CitadelStationBot
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
MoreRobustThanYou
73c1088d5a Adds a SCP-294 ruin 2018-02-11 05:13:56 -06:00
uraniummeltdown
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
Michiyamenotehifunana
440e102b34 Fixes and reimplements mag weapons
GREAT FUCKING JOB KEVINZ
2018-02-11 12:12:43 +08:00
BordListian
b8605a3618 - Purges all untruths (#35488) 2018-02-10 09:56:46 -06:00
Nick
8ef7eea4fa Merge branch 'master' into bunnypack 2018-02-09 07:10:12 +01:00
Improvedname
464077ef3a bunni 2018-02-08 20:31:26 +01:00
MMMiracles
4c6bdf1a9e Snowdin 2.0 2018-02-05 09:10:40 -06:00
CitadelStationBot
43ee34838f [MIRROR] Adds pineapples to botany, and Hawaiian pizza (#5260)
* Adds pineapples to botany, and Hawaiian pizza

* Update packs.dm
2018-02-05 03:00:22 -06:00
Zna12
a89e9f20aa Foam-Force Assault Machines. (#5243)
* REEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEE

i HAVE NO IDEA WHAT I'M DOING

* Wew. Managed to add the AM4 to the thingy.

WYSIWYG

* ALMOST DONEEEE

Wew. Just a few more tweaks

* To be reverted.

This is just adding a file of the sprite for the mag so I can work at work

* AM4B Complete, Moving to AM4C

And also I need to make the magazines.

* One step forward two steps back.

Magazine sprites are in. still need to test it.

* Forgot to save a file.

Woops.

* AM4 Finished.

Adds two weapons, the AM4-B and the AM4-C. Yes they're supposed to look like the MA5.

* Reverted those last couple things.

Deleted some loose files that I didn't actually need. Whoops.
2018-02-05 01:23:46 -06:00
CitadelStationBot
17ccbb4a53 [MIRROR] Adds tiny shards (#5299)
* Adds tiny shards (#35070)

* Adds tiny shards

* .

* .

* .

* .

* .

* .

* Adds tiny shards
2018-02-05 00:53:52 -06:00
CitadelStationBot
330a6ca0af Added transit tubes to the RPD (#5300) 2018-02-05 00:46:34 -06:00
CitadelStationBot
78ca971767 [MIRROR] Adds sprites for conveyor belt constructs (#5276)
* Adds sprites for conveyor belt constructs (#35252)

* lemme just convey this thought

* slight sprite update

* asdf

* Adds sprites for conveyor belt constructs
2018-02-04 23:12:47 -06:00
CitadelStationBot
071af77c99 [MIRROR] Corrects Airlock Animation Looping (#5275)
* Merge pull request #35220 from uraniummeltdown/airlocksprite

Corrects Airlock Animation Looping

* Corrects Airlock Animation Looping
2018-02-04 23:12:24 -06:00
Poojawa
4ce8f9ec80 clean up icons folder of unused .dmis 2018-01-31 07:38:58 -06:00
Poojawa
d7659ac6b2 sync with master 2018-01-31 07:02:55 -06:00
LetterJay
37d0ad44cd Merge pull request #5218 from Citadel-Station-13/upstream-merge-35127
[MIRROR] Redone Coffin Icons (Dikembe Mutombo Edition)
2018-01-31 04:13:05 -06:00
LetterJay
7ac807afa6 Merge pull request #5184 from Citadel-Station-13/upstream-merge-34849
[MIRROR] Adds the reverse bear trap item, available to traitor clowns in the uplink for 5 TC
2018-01-31 04:07:37 -06:00
Jittai
7dde4815ca Redone Coffin Icons (Dikembe Mutombo Edition) (#35127)
* Coffins

* cleanup

* moar grain
2018-01-31 01:52:40 -06:00
LetterJay
58da631638 Merge pull request #5192 from Citadel-Station-13/upstream-merge-34599
[MIRROR] adds extendohands
2018-01-30 23:16:22 -06:00
Poojawa
a24788842b dogborg tweaks, so fuggin DUMB (#5202)
* apparantly you need shuttles, who knew

* some tweaks

Sprites need adjustments
Janidogs need adjustments in UI

* Hm, maybe a fix. Revert attempt to rename sprites

* [MIRROR] Better Chat Squashing (#5193)

* Merge pull request #35058 from uraniummeltdown/chatsquash

Better Chat Squashing

* Better Chat Squashing

* [MIRROR] Sexy Solar Sprites (#5191)

* replaced solar panel sprites with better ones

* Sexy Solar Sprites

* Automatic changelog generation for PR #5191 [ci skip]

* [MIRROR] New Coffin Sprite (#5190)

* coffins have a new sprite (#34995)

* New Coffin Sprite

* Automatic changelog generation for PR #5190 [ci skip]

* [MIRROR] Makes fire colorful and anime (#5187)

* Makes fire colorful and anime (#34977)

* - Makes fire colorful and anime

* - Updates light color on fires
- Makes fire update color less often (1/7th as often)

* - Changes the transition from blue to purple to be much more gradual, it starts at 40000 and peaks at 120000 Kelvin now
- Changes fusion fire (>4 million Kelvin) to have a slight colorshift to it (It's just the druggy overlay).

* - Moves fire above gas (and everything else)
- Changes fire alpha for low temperature fires to compensate for items no longer rendering on top of fire

* - Makes the new fire layer a define and makes sure it isn't above "Hyperspace Ripples" whatever that is

* - Removes comment

* - FIRE_LAYER is already defined for burning humans.

* Makes fire colorful and anime

* Automatic changelog generation for PR #5187 [ci skip]

* [MIRROR] Expand Cyborg (#5183)

* Expand Cyborg (#34958)

* Expand Cyborg

* i ded pls nerf

* Oh sheet

* Expand Cyborg

* Automatic changelog generation for PR #5183 [ci skip]

* [MIRROR] Cosmic Bedsheet (#5170)

* adds cosmic space bedsheet

* Cosmic Bedsheet

* [MIRROR] The punisher no longer punishes ticker subsystems with delayed fires (#5174)

* Merge pull request #34964 from MrStonedOne/patch-463

The punisher no longer punishes ticker subsystems with delayed fires

* The punisher no longer punishes ticker subsystems with delayed fires

* Fuck this I'm done with it
2018-01-30 15:17:46 -06:00
CitadelStationBot
02b3e47fc3 [MIRROR] Cosmic Bedsheet (#5170)
* adds cosmic space bedsheet

* Cosmic Bedsheet
2018-01-30 07:31:26 -06:00
CitadelStationBot
0b330482fc [MIRROR] New Coffin Sprite (#5190)
* coffins have a new sprite (#34995)

* New Coffin Sprite
2018-01-30 07:24:18 -06:00
CitadelStationBot
001dbde0c9 [MIRROR] Sexy Solar Sprites (#5191)
* replaced solar panel sprites with better ones

* Sexy Solar Sprites
2018-01-30 07:23:46 -06:00
PKPenguin321
e4dd53a89f adds extendohands (#34599)
* adds extendohands

* adds to arcade prizes, crafting menu
also adds an alternate named/desc'd version for arcade prizes

* removes the else

* actual conflict fix instead of accidental revert

* ACME -> acme
2018-01-29 21:56:44 -06:00
Ashe Higgs
597b2864eb Adds the reverse bear trap item, available to traitor clowns in the uplink for 5 TC (#34849)
* Do you want to play a game?

* removes leftover code from earlier dev

* Some things

* optimizations, from the heart, for the soul
2018-01-29 21:55:27 -06:00
Poojawa
03086dfa91 Tg 1 28 sync testing/confirmation (#5178)
* maps, tgui, tools

* defines and helpers

* onclick and controllers

* datums

fucking caught that hulk reversal too.

* game and shuttle modular

* module/admin

* oh god they fucking moved antag shit again

* haaaaate. Haaaaaaaaaate.

* enables moff wings

* more modules things

* tgstation.dme

before I forget something important

* some mob stuff

* s'more mob/living stuff

* some carbon stuff

* ayy lmaos and kitchen meat

* Human stuff

* species things

moff wings have a 'none' version too

* the rest of the module stuff.

* some strings

* misc

* mob icons

* some other icons.

* It compiles FUCK BORERS

FUCK BORERS
2018-01-29 04:42:29 -06:00
LetterJay
b0c5941cd6 Merge pull request #5144 from Citadel-Station-13/upstream-merge-34957
[MIRROR] Morgue and Crematorium Resprite
2018-01-28 04:02:13 -06:00
Jittai
7dbcf48c5f Morgue and Crematorium Resprite (#34957)
* REDO

* Touch ups to Crema-tray, removes displays (for now)

* Smaller Less Contrast Screens + Traffic Stop style Lights

* ok last 1 I swear
2018-01-27 23:21:58 -06:00
uraniummeltdown
504a1d1ba9 new ore box sprite 2018-01-27 23:21:23 -06:00