Commit Graph
590 Commits
Author SHA1 Message Date
AtermoneraandGitHub cc3591ca80 Merge pull request #7552 from SplinterGP/master
Adds hailer gas (face) masks.
2020-08-31 15:08:57 -07:00
SplinterGP 093c73ae3c tweaks to sec hailer masks 2020-08-28 20:44:31 -03:00
SplinterGP b915e10de9 Tweaks hailer sec mask transforming and adds swat variants to lockers 2020-08-27 23:29:39 -03:00
listerla d56974cb92 Colony Director -> Site Manager 2020-08-25 20:12:29 -04:00
AtermoneraandGitHub a16e6ae0e8 Merge pull request #7456 from listerla/footwear
The great Aurora shoe heist
2020-08-25 16:14:48 -07:00
AtermoneraandGitHub 4a56ad2191 Merge pull request #7449 from Cerebulon/vendEnhance
Flavour Enhancement: Vending
2020-08-20 18:23:54 -07:00
listerlaandGitHub 89b880f0e1 Adds wearing cones and caution signs (#7466)
* Adds wearing cones and caution signs

* Fixes quarantine shuttle PoI

* Create Lorilili - janiwear.yml
2020-08-17 09:57:50 -07:00
listerla c3f9b4061d The great Aurora shoe heist 2020-08-10 17:28:07 -04:00
Cerebulon 0f146f3349 Flavour Enhancement: Vending 2020-08-09 05:05:43 +01:00
Rykka 6ff4642233 Merge branch 'master' into shep-dev-aurora-cooking 2020-07-22 23:09:42 -04:00
CerebulonandGitHub d7f25c36cb Flavour Enhancement: Crates (#7342)
* crates

* map changes

* rotation and dragging
2020-07-21 19:18:38 -07:00
Rykka aaf223b256 Aurora Commit 2 2020-07-16 20:52:28 -04:00
CerebulonandGitHub 4474f3f713 Flavour Enhancement: Guns (#7333)
* Flavour Lore: Guns

* New guns/sprites, crates, etc.

* couple o oversights fixed

* couple o oversights fixed

* final tweekz
2020-07-13 20:04:59 -07:00
Aronai Sieyes 34c85796c7 Restore large bin to glory 2020-06-10 10:25:52 -04:00
Aronai Sieyes 920fb6e17e Slight adjustments + name 2020-06-10 10:04:18 -04:00
Aronai Sieyes 7ebe0b516c Brings some variety and color to back to closets 2020-06-10 10:04:04 -04:00
Aronai Sieyes 48bf3ac804 Add icon bases since these are invisible on map otherwise 2020-06-01 12:44:09 -04:00
Aronai Sieyes d1a80ebbcb Prep for map updates 2020-06-01 12:38:24 -04:00
Aronai Sieyes 5cc996d82d Port Bay's lockers, crates, largecrates, wall lockers 2020-06-01 12:38:07 -04:00
Rykka StormheartandGitHub 9917f31031 Merge branch 'master' into shep-dev-upstream-screenport 2020-05-30 06:54:08 -04:00
Rykka fc1d6e741c Ported /tg/ style screen alerts, replacing the hunger icon with them
This adds throw_alert() and /obj/screen/alert, a system that allows you to do custom hud alerts for any variety of things from "You're too cold!" to mecha status indicators for the pilot.

There's quite a few things that actually got replaced; the
fire/oxy/tox/co2 alerts are all now just alerts, as is nutrition. There's also a number of new alerts, such as blindness, highness, legcuffed, buckled, handcuffed, and probably some more I missed; read code/_onclick/hud/alert.dm and see for yourself!

Additionally, a number of tweaks have been done to resisting code, to make it so that there's an indicator when you're buckled or handcuffed, and can just click the alert to start resisting. This includes a refactor that combines the logic for lockers, holders all into one proc, called container_resist().

Also, the health and internals indicator got moved down one tile each. Needed room for the alerts. If we add the oxygen tank action buttons from /tg/ and remove the internals indicator, the health indicator can go back where it was originally.

Alerts, pictured in the top right.
![https://i.imgur.com/H7Bipci.png](https://i.imgur.com/H7Bipci.png)
2020-05-23 04:48:47 -04:00
Aronai Sieyes ad75bb86bd Alter playsound paradigm 2020-05-19 11:06:28 -04:00
MechoidandGitHub aafd4b4fa6 Explorer Expansion: New Horizons (#6960)
* Large amount of work; Animal taming, shearing. Random animal spawns on sif grass/forest turfs. New PoIs, thermal poncho.

* Combat drone DMI moved to drones folder. Mining Drone subtype added. "Tameable" with ores, will collect and store ores when not in active combat.
2020-05-01 11:19:21 -07:00
Aronai SieyesandGitHub 6c6644f86c Rewrite examine() to pass a list around (#7038) 2020-04-29 13:42:16 -07:00
Aronai Sieyes ad5f0485f7 Clean up things 2020-03-25 22:10:56 -04:00
Cerebulon c6c7124583 Fixes emergency locker sprites 2020-03-07 10:10:00 +00:00
Mechoid af98219a50 Fix and tweak railguns. 2020-02-22 21:43:23 -08:00
Arokha SieyesandLeshana 5b15917d32 to_chat replacing stream operator 2020-02-17 13:14:08 -05:00
Amunak b8385aa417 Makes countable lists newline-separated, keeping inline as a separate "preset" proc 2020-01-30 01:24:40 +01:00
Amunak be8afe95b0 Separates "counting english list" to its own proc
The code is two distinct branches anyway, might as well be like this.
2020-01-29 17:23:24 +01:00
Amunak 3a5448f741 Prettifies closet contents list with (now added) countable english_list
Contents of closets (as viewed by ghosts) are now less ugly and easier to read.

- Adds reusable option to have english_lists count the contents and
display them (optionally with icons and specific determiners).
- Due to backwards compatibility these options are NOT available for
non-countable lists; this was originally planned, but it's not easily
possible unless all usage of english_list is revised.
- Moves the ghost examine code to proc/examine where it belongs.
- Ghosts now also see empty/full messages like characters standing
close do.
- The contents list for closets now shows number of items (if multiple)
and their icons (wherever possible).
- The list no longer shows unnecessary determiners ("the" before every
single item).
- Old usage of english_list still uses the old code. New code could
change order of the strings where it matters (in weather reports or
camera network assembly code, for example), so it cannot be used.
2020-01-29 00:59:26 +01:00
MechoidandAtermonera d9076dbaff Xenoflora expansion take2 (#6592)
Xenoflora
2020-01-08 10:44:41 -08:00
CerebulonandAtermonera f3e3703aae Coffee Shop Revamp (#6559)
* Adds bagels and decaf coffee

* Remaps the coffee shop to be a bit more appealing to visit.

* Map merge fuckery.

* Map merge fuckery. also changelog.

* took out blank line just in case

* why did the dmi do that

* revert unintended revert
2019-12-22 19:53:11 -08:00
MechoidandAnewbe 7ecdcb40d2 Security / PseudoCargo Expansion (#6482)
* Security Expansion work.

* Weaponized Racism, Stowaways, Meteors

* Fix Fix. Prep modular armor for addition.

* Fix the boots.

* More modular armor work. Now in cargo!

* Fixfix

* Fixfix

* Thank you anxiety very cool.

* Make a Stowaway Antag

* FixFix
2019-11-24 17:22:25 -05:00
TheFurryFeline 96e9358564 Orange Is The New Orange Part 2
Refactors prison jumpsuit slightly to not be a child of the orange jumpsuit, which in turn gets its own sprite. Left/right hand uniforms don't seem to be applying in-game when carrying the suits but that's not too bad of an issue. Uniform on the mob shows properly and works with sleeves rolled and uniform rolled down.
2019-09-07 12:30:41 -04:00
AtermoneraandGitHub 8388b6b56e Merge pull request #6434 from Heroman3003/hardening
Adds hardhats to engineering lockers
2019-08-31 14:12:24 -08:00
NovacatandAtermonera 7f49c680e5 Ports MREs from Baystation (#6424)
* Ports MREs from Baystation

- Ports MREs from Baystation
- Adds an 'Emergency ration' that contains liquidfood rations
- Two new ration packs that have the new rations.

* Placates travis

* Lynxlog

* Adds liquidprotein rations

* Sacrifice for travis

* Changes desc

* Fixing missing filling in crayon paste

* Fixes missing side for random rations

* Renames Paste Supplypack

* aaaaa minor error

* Slight organization

* Fixes some errors

* Why am I like this
2019-08-31 14:00:14 -08:00
Heroman 0f2cfe7d0b Adds hardhats to engineering lockers 2019-08-31 07:01:53 +10:00
TheFurryFeline bbf0dac15e Freebie Orange Jumpsuit
Splits the orange jumpsuit into two objs. One for loadout and one for prison clothes. Closets updated to reflect changes. Follow-up of https://github.com/VOREStation/VOREStation/pull/5561 which has no effect here but will fix a bug that results from it.
2019-08-05 19:33:47 -04:00
AndrewandAtermonera 504c28bc84 Combat Mechs Can Punch More Things (#6303)
* Combat Mechs Can Punch More Things

Removes the var to check for the 5 things it can attack, instead it can punch anything (but not everything will take damage).

Gives punching objects a check so you don't accidently smash something without meaning to.

Gives closets and canisters a proc to take_damage so they'll actually get smashed by the mechs.

* Take_Damage Boogaloo

* More take_damage Stuff

Adds click delay on attacking barriers.
Proper noises when attacking material doors and barricades.

More stuff can be broken by mech punch and simple mobs.

* Adds changelong

* usr to user
2019-07-24 12:58:39 -08:00
MechoidandAtermonera 40277238a4 Pipe Clamps, Shutoff Valves, and Leaking Tubes, oh my. (#6279)
* Pipe Clamps, Shutoff Valves, and Leaking Tubes, oh my.

* Fix processing fuckery.

* Deal with Forever-Seals, and Infini-clamps.

* Update clamp.dm
2019-07-24 00:44:59 -08:00
mistyLuminescenceandAnewbe 0d51ea81d5 tinytweaks (#6206)
* tinytweaks

* 5 != 2

* smfix

* requested changes + fixes exploit from 6212

* it compiled and worked anyway but go off i guess travis

* requested changes
2019-06-21 16:06:44 -05:00
Heroman3003 e27c9c3f0a Fixes fireaxe cabinets 2019-04-16 10:54:44 +10:00
NeertiandMechoid 0696ffe346 Fixes closet initialization (#6033) 2019-04-13 14:04:35 -07:00
mistyLuminescence f33073ba64 Beakers for Botany 2019-03-10 19:57:45 +00:00
mistyLuminescence 4b99995c02 Adds departmental turtlenecks 2019-03-07 01:05:05 +00:00
Neerti 76b077af4a Finishes seperating ZAS logic from CanPass(). 2019-02-10 01:46:38 -05:00
elgeonmbandAnewbe 3e9624caa9 Adds the Zaddat Race + Modifies pressure damage calculations (#5869)
* Redoes the suit-wearing bugs, renaming them to the Zaddat.

(If this shows up on the main Polaris repo, I fucked it again, please yell at me until I unfuck it)

* finishes the zaddat species pending someone yelling at me and or me getting more/better sprites

adds three new accessories of dubious stylistic value for the gaudy-ass suit people

* i lied
engineers and other Zaddat who start with a hat will no longer burn in the harsh light of the station.
scarves and other decor items can now be equipped to space suits. cape, half-cape, and sash items now have valid slot flags

* gives zad a larynx

* gives Zaddat assisted languages

* zad sprites now have weird growths

* activate starvation mode

* mask is now red-faced so as not to give the zaddat skin cancer

* adds shrouds and zaddat hypos to cargo. renames zaddat hypos to glucose hypos since like, technically anyone can use them

* aand adds zad hypos to the fitness machines. thanks for letting us not starve, spacer guild

* adds zad hypos to the fitness vendor

* new purple zaddat icons (untested, probably fine)

* appeases anewbe

* something bad has happened

* Updates Zaddat per forum discussion
Flashes now deal significant burn to zaddat, enough to put them in crit with two flashes
Zaddat (and diona and vox) can no longer wear rigs
Shrouds no longer protect against shock damage, but do protect against radiation damage
Prometheans can now wear shrouds
Sprites are much prettier

* adds changelog

* Update zaddat.yml

* appeases anewbe
2019-02-06 23:34:21 -06:00
NeertiandGitHub 9ff8103153 Merge pull request #5636 from kevinz000/pixel_projectiles
[READY]Ports /tg/station pixel projectiles, processing subsystems, timer subsystems, and some misc stuff to make it all work
2019-01-26 04:25:17 -05:00
atermonera 34d47b8580 Stasis bags don't murder patients 2019-01-19 16:45:56 -08:00