Commit Graph
947 Commits
Author SHA1 Message Date
ShizCalevandletterjay 18bc48c0df Makes swimsuits underwear (#38372) 2018-06-11 00:14:45 -05:00
Kraseoandletterjay cf8436cf6d a slippery slope into h*ck (#38303) 2018-06-07 20:00:36 -05:00
CitadelStationBotandkevinz000 0b362e017b [MIRROR] Lavaland Clock Cult Ruin (#7011)
* Lavaland Clock Cult Ruin (#38263)

* Dead Ratvar

* tgm map

* Lavaland Clock Cult Ruin
2018-06-05 11:16:55 -07:00
LetterJayandGitHub 72dd7cc3a5 Merge pull request #7008 from Citadel-Station-13/upstream-merge-38262
[MIRROR] New directional beach sprites and corners for the 2018 Summer Ball
2018-06-04 07:55:36 -05:00
CitrusGenderandletterjay bd6fb5f9e5 New directional beach sprites and corners for the 2018 Summer Ball (#38262)
* Adds beach corners, interior corners, and other sides in addition to the normal down direction.

* SOMEONE LIED TO ME

* Update misc_plating.dm

* don't copy paste at 4am

* okay there we go
2018-06-04 00:47:45 -05:00
MrDoomBringerandletterjay 678e429dbf Adds a Supplypod-delivery admin smite (#38069)
* wa la

* oop forgot an icon

* buildmode compatibility

* ok

* makes centcompod default

* CentCom pods fall faster and are capatilized right

* yike

* yike2

* FASTER

* white space and default icon state

* spacemaniac thanks
2018-06-04 00:37:24 -05:00
deathride58andGitHub d5487cfe3a Merge pull request #6981 from Citadel-Station-13/leechdonate
Jar o' Leeches - Donator Item
2018-06-03 22:58:35 +00:00
ShizCalevandletterjay b7ae796734 Fixes cigar bugs (#38218) 2018-06-03 09:03:59 -05:00
LetterJay 85ba48a053 donator item 2018-06-03 09:01:17 -05:00
LetterJayandGitHub 652b973810 Merge pull request #6975 from Citadel-Station-13/upstream-merge-38161
[MIRROR] Marginal Sprite Improvements Part 2: Cigarette Lighter Boogaloo
2018-06-02 07:31:01 -05:00
JStheguyandletterjay a3a0a49b5d Marginal Sprite Improvements Part 2: Cigarette Lighter Boogaloo (#38161)
* the rainbow of mediocrity rides again

* whoops that wasn't supposed to be there

* updated vending machine, burger, and donut sprites

they've all been improved marginally

* edits roborger a bit more

"bun" is flatter, has an antenna that blinks in agony

* does sprite things to lighters and cigar cases

* darkened cigar case interiors

* tweaks lighter flames
2018-06-01 09:53:33 -05:00
Cruixandletterjay 9c4f4ce17f AI Multicamera mode (#37695)
* Added multicamera mode for AIs

* Minor multicamera fixes

* Cameras near an AI multicamera eye now light up red

* Disabled AI multicamera mode without admin intervention

* Fixed AIs being able to use multicamera mode when they should not
2018-05-31 22:41:48 -05:00
deathride58andkevinz000 2f9e3e403d Hard upstream sync (#6951)
* maps - none of our changes included yet i'll get them in after i finish up the rest of the sync

* sync part 1 - underscore folders in code

* controllers folder

* datums folder

* game folder

* cmon, work

* modules - admin to awaymissions

* cargo to events

* fields to lighting

* mapping > ruins

* rest of the code folder

* rest of the folders in the root directory

* DME

* fixes compiling errors. it compiles so it works

* readds map changes

* fixes dogborg module select

* fixes typo in moduleselect_alternate_icon filepath
2018-05-31 16:03:18 -07:00
GuyonBroadwayandletterjay 0082b0f2c0 Ports gloves of the north star from Hippie (#37864)
* Ports gloves of the north star from Hippie

* Doing a white line

* adds customiseable warcry and sprites by Notamaniac

* star with a capital S

* Nitpick grammar
2018-05-27 11:40:47 -05:00
LetterJayandGitHub 69af2087aa Merge pull request #6848 from Citadel-Station-13/upstream-merge-37631
[MIRROR] Buffs atmospheric analyzers to show mole count, volume and higher degrees of precision
2018-05-27 01:32:02 -05:00
MrDoomBringerandletterjay 1a40822f17 Adds a sprite for the "quit vr" action button (#37994)
* is that a motherfucking 90s reference

* WHEN YA FUCK UP BADLY ENOUGH ON ADDING A SPRITE TGHAT YA GOTTA MANUALLY CHANGE CHANGELOG.HTML
2018-05-23 21:18:54 -05:00
cyclownsandletterjay f37865ee6c Buffs atmospheric analyzers to show mole count, volume and higher degrees of precision (#37631)
add: Analyzers can now scan all kinds of atmospheric machinery - unary, binary, ternary, quaternary, you name it. This means stuff like gas pumps, gas mixers, vents and so forth can be analyzed.

tweak: Analyzers now show temperature in kelvin as well as celsius.

tweak: Analyzers now show total mole count, volume, and mole count of all gases.

tweak: Analyzers show everything at slightly higher degrees of precision.


More accurate and advanced analyzers have been something that I think atmos and toxins mains have been wanting for a while now (including myself). It's always a pain to have to manually add 273.15 to every celsius temperature, or have to use outside tools or VV (which isnt usable in actual games) to calculate mole count for a gas mixture. Not to mention, the ability to analyze things like volume pumps and gas filters makes it easier to manage larger atmos setups. This is just a QoL change for people in any of those jobs. In fact, most players probably don't even know what the fuck is a mole is so adding mole readout to analyzers is a good way to get people to understand atmospherics better.
2018-05-22 22:11:23 -05:00
Jordan Brownandletterjay 638c2eb81d Merge pull request #37974 from AutomaticFrenzy/patch/glowshroom-icon
Fix glowshrooms missing their icon in the editor
2018-05-21 16:44:52 -05:00
Trevor Serpasandletterjay 61e1529e18 Circuit gun inhands and grabber fix (#37836)
* Grabbers update when a thrower uses its inventory and throwers and gun circuits need to use the gun assembly

* visible_messages
2018-05-17 10:27:25 -05:00
LetterJayandGitHub e99045054b Merge pull request #6744 from Citadel-Station-13/upstream-merge-37824
[MIRROR] Fixes curator hud icon
2018-05-15 06:52:53 -05:00
LetterJayandGitHub f86af0ab41 Merge pull request #6743 from Citadel-Station-13/upstream-merge-37818
[MIRROR] Fix some missing icons
2018-05-15 06:52:32 -05:00
YPOQandletterjay a7b5415a19 Fixes wumborian fugu dead sprite (#37832) 2018-05-14 18:55:54 -05:00
Jordan Brownandletterjay d4428a4114 Merge pull request #37824 from DaxDupont/hud-icon
Fixes curator hud icon
2018-05-14 15:14:46 -05:00
Jordan Brownandletterjay 7dc1c116d5 Merge pull request #37818 from AutomaticFrenzy/patch/missing-icons
Fix some missing icons
2018-05-14 15:13:33 -05:00
LetterJayandGitHub 5f25c8c5f7 Merge pull request #6730 from Citadel-Station-13/Donator20
donator labcoat
2018-05-14 09:45:20 -05:00
JStheguyandletterjay c462c16cc7 Marginally to Mildly Improves Vending Machine, Burger, and Donut sprites. (#37794)
* the rainbow of mediocrity rides again

* whoops that wasn't supposed to be there

* updated vending machine, burger, and donut sprites

they've all been improved marginally

* edits roborger a bit more

"bun" is flatter, has an antenna that blinks in agony
2018-05-13 19:47:01 -05:00
vuonojenmustaturskaandletterjay 998e49da06 Merge pull request #37809 from Qbopper/secskirts
Adds security jumpskirts this time with less broken github
2018-05-13 12:11:02 -05:00
LetterJay 1a1341989d labcat thingy 2018-05-13 07:06:27 -05:00
Jordan Brownandletterjay 3ba00b1e9b Merge pull request #37774 from KorPhaeron/pixel
Adds missing pixel to HoS parade uniform
2018-05-11 17:30:23 -05:00
ShizCalevandCitadelStationBot 6415ecdbe9 Shows assemblies some love. ♥ 2018-05-06 16:37:40 -05:00
ArmhulenandCitadelStationBot 04057dc7d6 Plasmamen organs GET sprites! (#37595)
* DONE

* initial

* Removes random slashes
2018-05-02 21:21:11 -05:00
Nabski89andCitadelStationBot b71e8718eb Animated Spellbooks (#37538) 2018-05-02 10:35:57 -05:00
deathride58andGitHub dca50e5d35 Merge pull request #6575 from Citadel-Station-13/upstream-merge-37349
[MIRROR] Adds fly and moth categories to limb grower
2018-05-02 01:21:37 +00:00
deathride58andGitHub 4851b9bd82 Merge pull request #6559 from Citadel-Station-13/upstream-merge-37501
[MIRROR] Fixes missing icons
2018-05-02 01:19:58 +00:00
deathride58andGitHub 9c41fd5516 Merge pull request #6566 from Citadel-Station-13/upstream-merge-37528
[MIRROR] Sprite reorganizing, minor sprite fix for mineral stacks
2018-05-02 01:19:11 +00:00
Trevor SerpasandCitadelStationBot 4a7ee96b76 fixes teleprod inhands (#37547)
* adds teleprod inhands

Because stunbatons not having inhands is kinda an issue.

* Removes my shit sprites, moves original sprites to the correct file
2018-04-30 01:16:39 -05:00
erwgdandCitadelStationBot 2ca75d7de7 added fly and moth categories to limb grower and limbgrower_designs.dm (#37349)
only human and lizard synthetic limbs will have should_draw_greyscale set to true

added /improper and uncapitalised synthetic limb names

removed plasmaman parts from human_parts_greyscale.dmi
2018-04-29 17:52:44 -05:00
PigeonsandCitadelStationBot 8dee99740d Moves all sheet prefix sprite from mining.dmi to stack_objects.dmi and fixes a typo 2018-04-29 10:06:14 -05:00
Jordan BrownandCitadelStationBot db142667b7 Merge pull request #37501 from ShizCalev/icon-fixes
Fixes missing icons
2018-04-28 14:54:45 -05:00
deathride58andGitHub 532ccc412c Merge pull request #6532 from Citadel-Station-13/upstream-merge-37373
[MIRROR] Fixes missing augmentation hands
2018-04-27 09:42:46 +00:00
deathride58andGitHub 2ee4d3e77d Merge pull request #6515 from Citadel-Station-13/upstream-merge-37326
[MIRROR] Removes SCP_294
2018-04-27 09:35:43 +00:00
ShizCalevandCitadelStationBot 9e3f99092f Fixes missing augmentation hands (#37373) 2018-04-27 02:42:13 -05:00
ArmhulenandCitadelStationBot 17aa0acef8 Removes SCP_294 (#37326)
* aaah sweet essence

* bye bye sprites

* goodbye machine code

* bye bye blacklist entry

* whoops

* scp gone from runtime

* bye bye ract

* bye bye space ruin folder

* bye bye area
2018-04-25 10:05:57 -05:00
Poojawa 1bbe495740 icons 2018-04-23 03:54:37 -05:00
AnturKandCitadelStationBot 8a3caaae6b Mapping component helper (#37314)
* Mapping component helper

* GetAllContents so you can manipulate things in crates/onmobs/whatever

* More verbose warning.
2018-04-22 19:18:17 -05:00
LetterJayandGitHub c6d5050fe7 Merge pull request #6435 from Citadel-Station-13/upstream-merge-37196
[MIRROR] Gives mining bots back their mesons
2018-04-22 02:41:25 -05:00
LetterJayandGitHub b4b41d33cf Merge pull request #6428 from Citadel-Station-13/upstream-merge-37204
[MIRROR] Add missing bio suit on-body icon
2018-04-22 02:38:58 -05:00
ShizCalevandCitadelStationBot 79863a5ffb Adds new window spawners 2018-04-18 13:51:53 -05:00
vuonojenmustaturskaandCitadelStationBot ed201bc65d Gives mining bots back their mesons (#37196)
* Gives mining bots back their mesons

* qdel
2018-04-16 04:36:40 -05:00
Jordan BrownandCitadelStationBot 7122beb985 Merge pull request #37204 from AutomaticFrenzy/patch/bio-suit
Add missing bio suit on-body icon
2018-04-15 22:25:23 -05:00