Commit Graph

20078 Commits

Author SHA1 Message Date
MagmaRam
1f610af340 Alphabetized new hairstyles (#7819) 2021-01-09 19:09:25 -08:00
Cerebulon
cc8d32be70 Makes vending virus spelling consistent. (#7814)
* Filth + Graffiti Fixes

* Excised Bad Lore

* Makes Vending Spelling Consistent

* why the fuck are these commits stil here
2021-01-09 19:08:48 -08:00
Atermonera
692a8c2f41 Fixes dark click catcher (#7803)
* Fixes dark click catcher

* Safeguards against different view sizes

* Damnit example map
2021-01-03 15:20:32 -08:00
Atermonera
4fe327583c Space cleaner cleans mobs (#7802) 2021-01-03 15:19:20 -08:00
Cerebulon
04ded47fbd Excised Errant Bay Military Lore (#7810)
* Filth + Graffiti Fixes

* Excised Bad Lore

* Update filth.dm

why was this here oops i was on master
2020-12-31 21:40:40 -08:00
Atermonera
c58fb16bc1 Adds proc to properly update human icon gender (#7813) 2020-12-31 21:31:35 -08:00
Atermonera
5b6631088b Merge pull request #7687 from ShadowLarkens/tgui_engineering
TGUI Engineering... and a bunch of other random things
2020-12-31 11:32:03 -08:00
Mechoid
063a2a30b8 Adds a Whip. (#7780)
* Adds material-based whips. The chain of command, as a whip-a-like, has reach 2.

* Adds the Whip to leather-crafting.

* Fix Inhands

* Don't test at night kids.

* Tweaktweak

* Map

* Span

* Don't spam more than one message on harm.

* Ranged Disarm now only occurs in logical context. (Aiming at arms or legs)
2020-12-27 16:55:08 -09:00
ShadowLarkens
b2b8f068bb TGUI Fixes 2020-12-24 05:17:34 -08:00
ShadowLarkens
983e7b8fc9 Merge remote-tracking branch 'upstream/master' into tgui_engineering 2020-12-24 04:50:24 -08:00
Atermonera
a34e3743f1 Fixes discarding cards onto walls (#7800) 2020-12-23 23:09:32 -08:00
atermonera
0839262788 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into ghost_emote 2020-12-23 16:06:48 -09:00
Hatterhat
1e91b20592 running board (#7787)
Co-authored-by: Hatterhat <Hatterhat@users.noreply.github.com>
2020-12-23 00:49:17 -08:00
atermonera
3852e0fecf Adds (Follow) link to emotes for ghosts 2020-12-21 23:05:17 -09:00
Hatterhat
8c790d91b4 A Thing About Digging Sand and Mineral Processor Speed (#7778)
* sand digging/mineral processor speed squashed

* typo moment + stacker also goes fast

Co-authored-by: Hatterhat <Hatterhat@users.noreply.github.com>
2020-12-21 18:34:40 -09:00
Atermonera
0c22294a90 Removes testing logs that were left in on stairs (#7791)
* Rewrites stairs

* Stairs go up and down

* Adds animation

* Polishes movement interactions.

* Grabs are moved across stairs, adds changelog

* Removes debug logs
2020-12-21 00:33:20 -08:00
atermonera
eaefe4155c Fixes facial hair coloring 2020-12-16 18:47:32 -09:00
Hatterhat
d695723e1b RPED QoL Tweak(s)/Unimplemented RPED Variant (#7784)
* this is incredibly scuffed

* this is a monumental W bossman

* parity with downstream

Co-authored-by: Hatterhat <Hatterhat@users.noreply.github.com>
2020-12-13 16:51:04 -08:00
Atermonera
47f71b2adb Reworks stairs to be sensible (#7783)
* Rewrites stairs

* Stairs go up and down

* Adds animation

* Polishes movement interactions.

* Grabs are moved across stairs, adds changelog
2020-12-13 16:25:13 -08:00
Mechoid
2018d76cae Department and Round Goals (#7369)
* Baseline work for Department Goals. Implements round-end stats, based in 3 categories of roughly-more-interesting to less interesting.

* Active Goal Separation.

* Map.

* Actually does the second half of this in this PR instead of a different one.
2020-12-11 15:16:47 -09:00
Atermonera
289dfbdb81 Merge pull request #7775 from Mechoid/FixBeards
Facial-hair nanites are no longer only vomiting toner.
2020-12-07 16:09:34 -09:00
Atermonera
3160e891b0 Merge pull request #7774 from Shadow-Quill/patch-1
Prevents infinite money
2020-12-07 16:09:02 -09:00
Atermonera
1e1d927046 Merge pull request #7773 from Verkister/patch-56
Fixes unreachable landmarks breaking spacetravel
2020-12-07 16:07:03 -09:00
Atermonera
2a68a38c9d Merge pull request #7771 from Runa-Dacino/trauma_modtaketwo
Creates framework for species to experience traumatic shock at different rates
2020-12-07 16:06:42 -09:00
Atermonera
997b440093 Merge pull request #7765 from Mechoid/PointDefense
Adds Point Defense turrets.
2020-12-07 16:03:31 -09:00
Mechoid
91aacb3f0f Plainleather & Tobacco (#7762)
* Rebrands leather to plainleather. Add tobacco and red-caps, redwood tallcaps.

* Seedpacket

* Sinks are wet.

* User
2020-12-07 15:48:49 -09:00
KasparoVv
f4798b4113 Adds & Upgrades a Bunch of Teshari Clothing (#7760)
* Adds Orange Teshari-Goggles, Species-fits some sprites, Updates Undercoats

Backports orange Teshari goggles
Species-fits rings for Teshari
Fixes captain glove sprites for Teshari
Species-fits hudpatches & white blindfold for Teshari
Species-fits some jacket accessories for Teshari (tan, charcoal, navy, burgundy, checkered)
Updates all Teshari undercoats so the leg portion fits better (like smocks)

* Adds Goggles to Loadout & Changelog

Missed a spot

* Woops, forgot job undercoats

Fix fix fix.

* Alright Y'all Asked for it

Replaces undercoats & cloaks with upgraded downstream versions

Adds hooded & belted cloaks

Adds white/recolourable blindfold

* Adds Worksuits, Adjusts Blindfold Loadout, Reduces Icon Size

Makes _s (object) states unidirectional
Adds Teshari worksuits (the icons were already here wtf)
Renames the recolourable blindfold in loadout selection

* Update the CL Noob

* Sort out Restrictions & Fix Typo
2020-12-01 23:29:12 -08:00
Atermonera
7ee6465b4f Merge pull request #7757 from Jwguy/FoodAdds
Porting Food Additions
2020-12-01 23:28:47 -08:00
Mechoid
09ec6d43a0 Matter Matters (#7756)
* Begins work on maintaining equivalent exchange.

* Oopsie woopsie I made a fucky wucky.
2020-12-01 23:28:13 -08:00
Mechoid
cb919cdfbc Facial-hair nanites are no longer only vomiting toner. 2020-12-01 19:35:35 -08:00
Shadow-Quill
705e76187a Prevents infinite money 2020-12-01 15:57:31 -06:00
Verkister
fa5aa67610 Fixes unreachable landmarks breaking spacetravel
Adds a sanity check to prevent overmap spacetravel locking onto unreachable landmarks (such as other shuttles and such that are docked inside other landmarks and thus not on the overmap itself) and getting killed by a runtime.
2020-12-01 22:12:22 +02:00
Runa Dacino
c46af4cf41 Creates framework for species to react differently to traumatic shock
* Adds new var called "trauma_mod" for downstream

Will not affect anything on Polaris unless someone elects to add traits that can change this, or to use it for species defines.

Makes it that you basically go into paincrit faster or slower.

* Makes use of trauma_mod var from species.dm. 

Will not affect anything on Polaris unless someone elects to add traits that can change the variable in a mob, or to use it for species defines.

Makes it that you basically go into paincrit faster or slower.

* Adds changelog for trauma_mod variable addition

* Fixes differences between VOREstation and Polaris

I was dumb and just copy from downstream to upstream, thinking there'd be no differences in the file.
2020-12-01 01:35:04 +01:00
Atermonera
4ecc80f499 Move away from Travis CI to GitHub Actions (#7768)
# Conflicts:
#	.github/CONTRIBUTING.md
#	.travis.yml
#	code/modules/awaymissions/zlevel.dm
#	code/modules/ventcrawl/ventcrawl.dm
#	guides/Guide to Map Folders.md
#	maps/submaps/engine_submaps_vr/tether/_engine_submaps.dm
#	maps/submaps/space_submaps/debrisfield/debrisfield.dm
#	maps/tether/submaps/_tether_submaps.dm

Co-authored-by: ShadowLarkens <shadowlarkens@gmail.com>
2020-11-29 23:35:15 -08:00
Atermonera
c6dd93cd5c Merge pull request #7766 from Greenjoe12345/teshname
Teshari name generation fix
2020-11-26 11:32:20 -08:00
Atermonera
077a72bd96 Merge pull request #7761 from Mechoid/ArmLaserUniquify
Arm-Laser rebranding.
2020-11-26 11:27:20 -08:00
Atermonera
e75a3a5071 Merge pull request #7755 from BlackMajor/patch-2
Fixes pointing going under mobs.
2020-11-26 10:53:59 -08:00
Mechoid
8b730e3a90 Allows mobs to ventcrawl with any item in their allowed items list, even if it's worn or carried. 2020-11-25 01:47:44 -08:00
Greenjoe12345
6eb6129cd0 Changes randomly generated Teshari names so they generate according to Tesh lore 2020-11-25 01:08:17 +00:00
Mechoid
8fa749fbe5 Adds Point Defense turrets. 2020-11-24 03:36:59 -08:00
Mechoid
1fb1cda70b Makes the arm-laser distinguishable from the laser carbine in name and mobstate. The arm-laser also has reduced one-handed penalty, given it is literally your arm, and you can probably point at something with your fore-arm. 2020-11-21 03:51:14 -08:00
Mechoid
576d0657ce Kaleidoscope 2: The Retabbening (#7697)
* Begins the Project

* Move things to where they belong, if viable.

* Merge and move those files.

* Finish filenames, fix Taj ears.

* Tweak to Ater's Requests

* The Great Mergening with 03_body.

* Per Requests

* Continue per request. Plot nefarious plans to make Saviks usable as battlemounts.

* Smarter Proc Use

* Tweaken
2020-11-19 10:04:09 -08:00
Atermonera
6c8ed1e8d5 Merge pull request #7759 from Mechoid/FixOrgansSimplemob
Fix Simplemob+ Organs
2020-11-18 13:56:59 -08:00
Mechoid
b411c75a19 Self-Surgery (#7671)
* Allows organics to self-surgery after standing still for 5 seconds. It follows the same rules as normal surgery.

* Confirm-by-delay for self-surgery steps.

* Verb to toggle self-surgery.

* Add log.
2020-11-18 13:55:33 -08:00
Mechoid
50251d36c6 Fix a Fuckup, simplemobs no longer actually CONTAIN the organs before butchering or gibbing. 2020-11-14 23:51:53 -08:00
Silver
e2773216c9 Porting Food Additions
Adds the Following Foods:
Gigapuddi
Happy Gigapuddi
Angry Gigapuddi
Omurice
Heart Omurice
Face Omurice
Suppermatter
Suppermatter Slice
Exciting Suppermatter
Exciting Suppermatter Slice
Cinnamon Bun

Also adds the following Festive Foods:
Buche de Noel
Turkey

Comment:
Not sure why, but I attempted to have Buche De Noel and Turkey as Oven recipes, but it was producing baked items rather than the intended recipe. It all tests out fine locally, as is, though.

All of the foods besides the Cinnamon Bun (which is original) are ported from /vg/station,  with minor modifications (missing Living Puddi code and some recipe alterations to make them play nice with existing ones), per their license.
2020-11-14 05:20:37 -06:00
BlackMajor
391f35eb5b Fixes pointing going under mobs.
See title.
2020-11-11 14:58:54 +13:00
Atermonera
499c248712 Merge pull request #7751 from Greenjoe12345/clothesporting
Ports some clothing from uristcode
2020-11-07 12:30:31 -08:00
Atermonera
f2c5078ad3 Merge pull request #7701 from Mechoid/Frostbelle
Adds the Frostbelle
2020-11-07 12:20:23 -08:00
Mechoid
68b370be8a Fresh Meat, Leatherworking (#7629)
* Make Butchering more modular. Don't tell the demon lords.

* No guts no glory. That was far more work than expected to get organs to just process and work for butchering holy shit.

* Chitin and hides oh my.

* squeak. ..Why did this not fire on local?

* Squelch.

* Seven cubed livers, for the doctors in their sterile halls.

* Changeling

* Prep for Datums

* Fix Broken Broken Guns

* Redundancy

* F l a g s
2020-11-07 12:06:35 -08:00