Commit Graph

1597 Commits

Author SHA1 Message Date
GeneriedJenelle
5c7c959949 Adds Cider Bottles (#6201)
* Adds Cider

How has SS13 alcohol gone on so long without cider? Let's fix that.

* Update cartridge_presets.dm

* Update dispenser2_energy.dm

* Update dispenser_presets.dm

* Adds cider bottle sprite + adds to borgs

* Update Chemistry-Reagents-Food-Drinks.dm

* Removes additional cider entry
2019-06-18 19:04:35 -05:00
Novacat
5b18382ca6 Grey scale pills and colored pillbottles (#6199)
* Grey scale pills and colored pillbottles

Baystation ports of PR #19714 and PR #21578

Known issue: The Chem master's pill selection does not properly show the grey scale pills, unfortunately. There is a 'close enough' approximation, however.

* Minor oversights

* Another oversight

* Programming language confusion

* Corrects some code
2019-06-16 20:28:02 -05:00
Ketrai
d891fa2836 Adds worms 2019-06-07 19:55:03 +02:00
Atermonera
a033ac4779 Merge pull request #6113 from Mechoid/FishingFtWorldServer
Fishing!
2019-05-06 10:15:23 -08:00
Neerti
083c4f599f Merge pull request #6149 from Novacat/nova-holowarrant
Buffs adminordrazine
2019-05-05 20:06:47 -04:00
Mechoid
53b84236cf Merge branch 'master' of https://github.com/PolarisSS13/Polaris into FishingFtWorldServer 2019-05-03 21:44:53 -07:00
Unknown
9ce4361faa Ports #6039 with Virgo Fixes 2019-05-03 20:36:06 -04:00
Unknown
7eeb7c0ce1 Changes adminordrazine pill shape/metabolism 2019-05-02 19:39:23 -04:00
Unknown
822a9c7259 Buffs adminordrazine 2019-05-02 17:36:29 -04:00
Mechoid
1f9fe948c4 Sterilizine Hurts Slimes 2019-04-18 18:51:23 -07:00
Atermonera
2af21a1911 Merge pull request #6096 from Heroman3003/syringe-beaker-interactions
Changes way syringes interact with containers
2019-04-18 09:26:34 -08:00
Mechoid
e1876dcd02 Fishing and all its wonders, Ft. World Server code bastardization. 2019-04-17 23:41:03 -07:00
Heroman
2cb39322d1 Changes way syringes interact with containers 2019-04-16 17:10:56 +10:00
Mechoid
4b4035932f Modifier integration. 2019-04-14 13:38:10 -07:00
Mechoid
e668b12bc5 Liver and Kidney filtration 2019-04-14 11:56:20 -07:00
Mechoid
8fa53f6611 Starts work on Pulse-based Reagent Processing. 2019-04-13 23:52:33 -07:00
Mechoid
3808093471 Fix forgotten stuff. 2019-03-31 17:35:55 -07:00
mistyLuminescence
effe543406 Unidentified Auto Tweak 2: Electric Boogaloo (#5990)
* Remakes #5983 by request.
2019-03-31 16:19:06 -07:00
Schnayy
5e96a1c1be Fixes drinks and adds new one. 2019-03-05 22:46:07 -06:00
Mechoid
f50ae5b633 Tweaktweak 2019-02-10 18:14:04 -08:00
Mechoid
9a845219bf Tweak Daxons 2019-02-09 20:52:33 -08:00
elgeonmb
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
Neerti
9175f5801d Fixes compile error.
I put the CLAMP()s to it.
2019-02-01 15:29:00 -05:00
Atermonera
644978ea1c Merge pull request #5846 from Mechoid/ChemicalsChemicalsChemicals!1
Adds multiple organ-related chemicals.
2019-01-31 20:42:47 -08:00
kevinz000
46c79c7d3e [READY]Makes a bunch of processes subsystems instead (#5814
* Converts various New() definitions to Initialization()
* Adds absolute pathing
2019-01-15 22:58:06 -08:00
Neerti
b1860f9baa Merge pull request #5829 from kevinz000/tg_vv
Ports TGstation view variables + admin proccall guards, and all the baggage that comes with it
2019-01-15 22:18:50 -05:00
Mechoid
0db38cb75b Wooooooork 2019-01-14 21:34:35 -08:00
kevinz000
61561ade31 Clamp replace 2019-01-12 05:51:08 -08:00
Neerti
3880d13e10 Merge pull request #5815 from Heroman3003/eggnog
Adds eggnog drink to the game.
2019-01-12 04:29:04 -05:00
Heroman3003
8b6a62a496 Adds eggnog. 2019-01-08 12:31:42 +10:00
Spades
e37f25546a Fixes a typo that broke the saketini recipe (#5807)
Ported from https://github.com/VOREStation/VOREStation/pull/4534
2019-01-05 23:46:05 -08:00
Neerti
68d3406898 Merge pull request #5773 from Neerti/identification_system
Adds Identification System, New Autoinjectors
2018-12-14 21:06:06 -06:00
kevinz000
d15f7efa5b Merge branch 'master' into PS_PORT_SCHEDULER 2018-12-06 18:10:48 -08:00
kevinz000
8da11c17a2 Makes math helpers defines for performance (#5654) 2018-12-06 13:13:59 -08:00
kevinz000
a52c341861 Merge remote-tracking branch 'polaris/master' into PS_PORT_SCHEDULER 2018-12-06 10:20:46 -08:00
Atermonera
3155d5829f Merge pull request #5735 from Neerti/hopefully_last_master_sync
Merges AI Branch into Master
2018-11-30 21:05:42 -08:00
Kates
ae85355106 Remplace pills made by the condimaster with bouillon cubes. (#5689)
* Remplace pills made by the condimaster with bouillon cubes.
Just a couple lines remplace so the condimaster can create pills which look like bouillon cubes (monkey cubes)
The .DMI change is just me adding the monkey cube sprite with a different name. It was fair easier than to have the template look into another file for the icon.

* Remove duplicates

* Fix names being redundant

* Add a description for ze pill.
2018-11-09 21:02:37 -06:00
Neerti
35aab759be Fixes conflicts yet again. 2018-11-02 21:09:56 -04:00
Neerti
cd628f1909 Merge pull request #5698 from Mechoid/Blood_For_The_Blood_Promethean
Prometheans can process blood without exploding.
2018-10-30 18:40:35 -04:00
lbnesquik
9cc4ffbb9c Merge branch 'master' of https://github.com/PolarisSS13/Polaris into Kates-Machinery-Port 2018-10-23 21:52:44 +02:00
kevinz000
50aa3fa15c Merge remote-tracking branch 'polaris/master' into PS_PORT_SCHEDULER 2018-10-21 21:24:25 -07:00
Neerti
56a65ee2bb Fixes old mecha mob path, goats werent animals for some reason. 2018-10-21 23:13:09 -04:00
Mechoid
145e585b2e Prometheans can process blood without exploding. 2018-10-21 18:23:30 -07:00
Neerti
88398773b8 Master to ai electric boogaloo (#5682)
* Ports the supermatter grenade, supporting code

* May or may not make movement seem smoother

* Fixes the Sleepy Ring

* Partially ports the GLOB system

* Fixes the bug(s) that allow meat bodies to have metal brains

* ports VOREStation/VOREStation#4165 - i forgot to check if advanced who was a thing here

* Optimizes supply UI

* Transfer shuttle grammar fixes

* Fixes borked E and W fish sprites

* Fixes incorrect ETA in crew transfer announcement

* Ports descriptors from Bay

* Add files via upload

* Removes Noble Defines

* Mech Mini 'Revamp'. Will need playtesting. (#5480)

* Exosuits are now capable of holding more equipment, of specific types.

* Tweaks regarding feedback in staffside thread, other concerns.

* Tweak to be more consistent. Why did the Odysseus have two universals. Tweak to weapon restriction on Med - > Odyss

* Weapons only fit in universal combat slots.

* Adds smart magazine, magazine functionality

* Adds a new subset of grenades that shoot projectiles

* Low alpha now makes HUDs and tooltips not show up on you

* Fixes a UI bug with emptying currently-open bags into smartfridges...hopefully. (#5515)

* Update smartfridge.dm

* actually indicates which line solves the bug

* Adds a whole bunch of Exosuit weapons and other miscellaneous parts.

* Minifrags now use the small fragments mainly as they should.

* Iced beer no longer freezes you to 3 degrees C, which is enough to seriously burn a Skrell. Seriously, that's weird.

* Touch stuff in reference to responses.

* NanoUI now processes again

* Initial Work: Manifest, Newsfeed

* Adds newscast viewing, manifest

* Cartridge devices

* Template progress

* Med records, Sec records, Emp records

* Cartridge work part 1

* Cartridge work: part 2

 * Power monitoring console
 * Cartridges have persistent, internal data
 * Code to load element-specific data upon request, instead of serving all relevant data at once
 * Janitorial Supply Locator

* Refactor crew manifest to a separate file

* GPS cartridge

* Reorganize GPS to proper organization, important comments

* Supply cartridge

* Status display access

* Merc blast door controller

* Appeases travis (Round 1)

* Appeases travis (Round 2)

* Headset sprites are now on the default ear, which is left

* Cleave changes, attack code cleanup

* Catching is no longer guaranteed, accuracy code is more general

* Adds a Neural implant for future implementation. Promethean brains have been updated to fit it.

* changelog

* Robots can attack things again

* Might help with air subsystem lag

* Ports the spinny throwing animation from Bay

* Cult heal modifier no longer does Shit-Tons of agony. Does mediocre agony on non-cultists.

* Defines.

* Headset sprite tweaks

* Shield Drone no longer auto-fails with Energy Relays.

* I'm an idiot.

* PoIs can be rotated in increments of 90 degrees

* Might fix the server startup error_handler runtime

* Cult Girders are back to being proper.

* Submaps can now be rotated to any cardinal direction (South is default)

* Should fix another runtime with tools

* Buffs the Vox

* Removes debug code (Yes, I'm an idiot)

* Ready for merge

* Fixes some bugs tangentially related to Vox code

* Ports /vg/ instrument frame work, adds client based sound pref

Also shifts sound files which is 98% of the bulk here.

* Helmets now show only certain hairstyles

* fixes the trailing tag, I think

* Scrubbers no longer automatically scrub phoron (#5512)

* adds manual changelog

* Adds new set of cyborg sprites for medical/science/default/security/combat (#5546)

* Refactor cargo trains, they're just normal trains now. Adds the Quad, and re-enables/fixes the Space Bike!

* communicator_header.tmpl now correctly includes Body

* Adds tails to Unathi rig suit sprites (#5551)

* supplycom/control drops the correct circuit

* Emags have an effect on cargo consoles

* The cybersuit is now a space suit.

* Map Bugfixes

-	Fix for mislabeled c_tag cameras, first deck
-	Fix for mislabeled c_tag cameras, second deck
-	Fix for poi crashed containment shuttle mapping issues (terrain generation)
-	Fixed wrong floor type on skipjack
-	Fix for scrubbers pipe, central substation
-	Fix for air supply pipe, chapel
-	Fixed scrubber pipe, Engineering Drone Fab
-	Fix for air supply pipe, Prison Wing
-	Removed redundant supply and scrubber pipe, Security Auxiliary Dock
-	Fix, Fore Aux Dock airlock pipe.
-	Fix air supply pipe, library
-	Fix, scrubber pipe, coffee shop
-	Pipe fix, Medical maint
-	Fix, supply pipe medical secondary storage
-	Removal, redundant supply pipe, cargo maint
-	Fix, virology scrubbers pipes
-	Fix Xenobio and Xenoflora missing atmos connection to the main outpost
-	Fix, missing atmos connections between Main outpost telecoms and main outpost atmos
-	Fix for missing power wires, HoS Office, Warden Office, Heads of Staff Meeting Room
-	New, random mouse spawner
-	New, random mouse spawners added throughout maintenance on the station (maybe too many, maus station 13)
-	New, 30 sheets of lead added to engineering
-	Fix, POIs should now be rad protected and characters won’t be affected by the radiation event

* Fixes Lead Walls (#5562)

A material's ``radiation_resistance`` was never considered for calculating a wall's cached resistance to radiation. This fixes it. There is another issue involving r-walls not being better at stopping radiation than their normal-wall counterparts made of the same material but fixing that involves a lot of number adjusting to avoid the SM engine from getting twice as protective.

* Yet Another Circuit Update (#5549)

* Circuit updates, adds new components, improves printer, new assemblies.

* Finishes powernet circuit.

* Adds wearable assemblies.

* Finialization before merging with GLOB port.

* Finishes circuit update, hopefully.

* Forgot to undo map.

* Removes debug output.

* Readds size traits

* Signal pistol can be reloaded (#5566)

* Makes Blobs more useful.

* Rig and Spacesuit additions

- Added the 'military' Rigsuit from Bay.
- Added 'pmc' rigsuits
- Added exploration and pilot voidsuits along with alternate sprites (alternate sprites done by Naidh)
- Addition of suit cyclers for exploration and pilot voidsuits

None of these suits are currently accessible in game outside of admin bus. Currently only the pilot voidsuits have other species sprites. Exploration suits are missing sprites for Teshari (Naidh made some for their alternates but I have to add them) and the rig suits are human only. This is to be fixed in the near future, just wanted to get the make workload actually in the game first.

* Dermal implant doesn't cover hair

* Fixes a couple of tool related oversight/runtimes

* Fixes hand and leg cuffs

* Technically adds the Ore Redemption Machine

* Update combat.dm

* Boot knives fit in boots

* Adds tails to Unathi rigsuits (again)

* PoI fix

* Skrell names no longer contain spaces

* Descriptors now properly respect species differences

* Make the Statue NOT entirely immortal.

* Psychiatric Medication Fix (#5588)

* Psychiatric medications are faster when ingested

* Psychiatric med fix

* Updates changelog

* Tweaks emitters and Pacman

* Adds the Biopsy Scanner to the Surgery Kit (#5589)

* Adds the Biopsy Scanner to the Surgery Kit

Since it's actually used in a surgical operation, it should proooobably be in the kit. Iunno if the kit is really used here aside from antag shuttles, but they might as well have it.

* Added a missing comma

Missed a comma, might be what's causing issues. Iunno. It worked flawlessly in dream-maker.

* Adds some Holy drinks, and Promethean-safe drinks / acclimators. (#5574)

* Adds some Holy drinks, and Promethean-safe drinks / acclimators.

* Carbon + Water + Oil = Sludge

* TRUEFALSE & * removed

* Be Smart about damage things.

* Don't spawn things in Null please.

* Adds a generic proc to the mining vendor to add custom / blank entries.

* Keys now actually exist again.

* Species item slowdown changes

* Pose now shows up under descriptors

* Fixes Circuitry Glasses.

Button in HUD should work now.

* Phase rifle size correction

* Should fix the new bugs with webslinger spiders (#5612)

* Hyposprays can now have different sounds

* admin helps, but working this time.

* handle issue, GLOB staffwho

* admin list seems bork'd cleans up feedback messages

* Fixes grabs breaking defined mob pixel offsets.

Yeah.

* Custom RIG Framework (#5613)

* Framework for Custom RIG sprites.

* Fixfix

* line ending

* Text for handheld plushies when poked

Plushies now make sounds when poked. Squeak!

Ported from https://github.com/VOREStation/VOREStation/pull/4231

* Shotgun cycling animation framework
This adds the possiblity for empty sprites on all shotgun/pump/thing and for cycling animations.
https://cdn.discordapp.com/attachments/407267031562453032/488751327531368481/2018-09-10_18-43-05.gif
This particular weapon was made by a friend so i'll wait for their permission before porting it in.

* Add an animated rifle.
Nothing is particularly impressive except the animation.

* Fixes some bloodloss bugs

* Move almost everythign food related into the kitchen module.
Not moving reagents and tools.

* Minor issues fix.

* Remplace sprite hammer with pickaxe
This particular hammer had been sitting 'waiting for sprites' for 4 years at least. Could be a lot more really.

Fixeshttps://github.com/VOREStation/VOREStation/issues/4183

* Fix mislabelled posters.
https://github.com/VOREStation/VOREStation/pull/4310
https://github.com/VOREStation/VOREStation/issues/3597

* Remove kobold.dm
This file has no sprites and is used nowhere. It does have some kinda cute emotes but without sprites it's useless and has been since 2017 and maybe much longer. I haven't found any references of it's origin either.
~~maybe virgo will do sprites i dunno~~

* Fix yes emote not working correctly.
It's a lazy fix but it works.

* Fixes chem master dumping reagents.
Previously, if you used a bluespace beaker and transferred all of it's contents, the chem master buffer would silently drop all of those chemicals without warning.

* Fixed smes terminal construction requiring more cable than used.

* Fixes laptop blocking grown adults.

* Fixes several typos with oxygen_pump.dm.

* Fix the condimaster not working.
Previously, you simply couldn't make any condiment using this machine. Now you can. There was just missing template which is back in with this PR. (Thanks aronai.)
This means you should consider remplacing it in your kitchens.

* Remove intensity from chemistry machines.

* Add a noise for mining scanners.
This should affects all devices using it too.

* Prevents people from HREF exploiting around the R&D console.

* Lock has a check already, so remove that.

* reeeeeeeee

* Fixes missing sprites when excavating rocks

* Xenoflora and Xenobio House Move

- Moves Xenoflora and Xenobio stationside, on first deck. Leaves the old labs still up planetside for the time being.
- Minor bug fixes, missing lights, mislabeled lockers in robotics, floor decals.

* Changes << to to_chat at request.

* wax staxs

* Fix plastic ashtrays only holding one butt. Now they hold 4butts.
jeez bill.

* Move surgery caps into their own selection.

* Fixes maploading

Imagine you're on the last iteration of this loop, you've done the final column of X coordinates and you're going to set maxx.
Would you want to set it to where you are now, the final X column... or would you want to add ONE MORE beyond the template size for some reason then set it to that?

This bug causes all templates that are the size of normal maps to fail to initialize any atoms if your template is the size of your normal maps, because it tries to obtain a square of size minx, miny, minz, maxx, maxy, maxz to initialize, however maxx is nonextant because it exists outside the bounds of the world. It also causes all submaps to initialize an additional column of atoms twice, or not initialize any if they spawn against the right edge of the map.

* Graves (#5622)

* Adds support for closets storing closets, and graves

* More Grave Things

* Chnglog

* Polaris Vision Tweaks

* Fix a couple of ticket bugs

Don't show admin character names when they reply, and this proc appears to take different options on tg, so was fixed here.

* Prevent people from removing papers from any distances.

* Removes maintenance access from cleanbots

This should stop them from wandering into maintenance never to be seen or heard from again.

* Remove very annoying midi tools

* Magazines improvements (#5666)

* Give sounds to emptying magazines

* Clear some trash in the saber magazines

* The magazine NOW behaves correctly.

* The second half and more casing noises.

* Fixes map and makes everything compile.
2018-10-20 14:05:50 -07:00
Anewbe
10e7a490d3 Merge pull request #5626 from lbnesquik/Kates-kitchen-fix
Move almost everything food related into the kitchen module.
2018-10-15 14:46:49 -05:00
kevinz000
4bb5ec014a Regex2 2018-10-14 20:04:44 -07:00
kevinz000
2c0898f870 Regex 2018-10-14 20:03:17 -07:00
kevinz000
84ea3c0931 JFC 2018-10-14 19:45:38 -07:00
Neerti
df16611a3a Does some AI work. 2018-10-14 01:50:54 -04:00
lbnesquik
2608817abd Port some noises from baystation.
- Plays keyboard noises for every computers
- Button noises for the chem master
- Mini framework for easier noises put in. Couldn't put in everything without a lot more work than i felt like doing this Saturday.
2018-10-13 19:35:14 +02:00