Commit Graph

19906 Commits

Author SHA1 Message Date
Schnayy
3dcc9cc57f Merge pull request #7846 from Cerebulon/medrecfixfix
fixed medical record fix which wasn't fixed in the vore fix
2021-02-06 19:21:19 -06:00
Schnayy
65f48cd708 Merge pull request #7845 from Cerebulon/foodfixes
Absurd Amount of Food Fixes
2021-02-06 19:19:45 -06:00
Cerebulon
dcd5da8580 Event Managers Can Aghost Interact 2021-02-03 23:01:28 +00:00
Cerebulon
5064cdbc41 Un-inverted oven messages, reagent-add code unborked 2021-02-01 03:28:10 +00:00
Cerebulon
2e5e419300 fuck off die 2021-02-01 01:15:21 +00:00
Cerebulon
0b667cc948 Filth + Graffiti Fixes 2021-02-01 00:52:25 +00:00
Cerebulon
dc41d2141d typo 2021-02-01 00:44:24 +00:00
Cerebulon
c5c97ff177 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into foodreview 2021-01-29 10:56:06 +00:00
Cerebulon
f38e17456c ffff 2021-01-29 10:47:53 +00:00
Cerebulon
aa22ef3ef7 Every Food Fix 2021-01-29 10:46:10 +00:00
Cerebulon
541dd85456 TGUI Fixes, including aghost interaction. (#7843)
* Filth + Graffiti Fixes

* TGUI fixes

* fixed the rebase graffiti thing AGAIN

* javascript indents

* rebuild zzzzz
2021-01-27 19:47:09 -09:00
Mechoid
1de8bc1c40 Industrial Expansion (#7811)
* Begins work on the Industrial expansion, ft hidden Lore

* Removed Painite, Quartz, and Void Opal from generation pending their eventual uses. Recipes modified to use them have been reverted of this use.

Fix Fix.

* Reset map to master.

* Add copper to Robotics, R&D, Engineering, and EVA.
2021-01-27 19:28:13 -09:00
Atermonera
f7fec4fd67 Ports ping verb from /tg/ (#7837)
* Ports ping verb from /tg/

* Adds non-versioned files

* Removes old flag
2021-01-26 22:31:26 -08:00
Cerebulon
3aedcc62a8 Renamed a meme + cinnamon bun sprite. (#7840)
* Filth + Graffiti Fixes

* Gigpuddied

* death to changes
2021-01-25 17:27:09 -08:00
Cerebulon
c729c0e23b Fixed global_announce autospeaker (#7839)
* Filth + Graffiti Fixes

* Excised Bad Lore

* Fixed Global Announcer

* fuckinn
2021-01-25 17:24:39 -08:00
Cerebulon
a0b4b55b66 Filth + Graffiti Fixes 2021-01-25 01:14:27 +00:00
Schnayy
a0ee10e812 Merge pull request #7822 from H0lySquirr3l/master
Adds Chicken noodle soup
2021-01-24 18:38:11 -06:00
Atermonera
1cb1a80ec4 Merge pull request #7838 from Heroman3003/defibtimefix
Fixes defib timers being 10 times as long compared to intended.
2021-01-24 16:32:45 -08:00
Schnayy
49562f4a5f Merge pull request #7834 from Greenjoe12345/spriteandfold
fixes some sprites, adds a thin blindfold
2021-01-24 18:31:58 -06:00
Mechoid
95ea4f6f2d Mech Appearance Update (#7818)
* Mechs are now properly scaled. Also fixes the FUCKING taur sprites.

* What
2021-01-24 10:18:05 -09:00
Heroman
ab855ca531 Fixes defib timers being 10 times as long as intended. 2021-01-24 09:47:56 +10:00
Mechoid
119bd1f458 Wall Disposals (#7816)
* Makes wall disposals.

* Tweak map for the disposal gods.

* Sprite Tweak
2021-01-14 21:56:35 -09:00
Mechoid
bd9f63a97a Gadgets & Gizmos (#7786)
* Adds various objects for explorers / antagonists.

* T A G S

* Mend
2021-01-14 21:53:39 -09:00
Greenjoe12345
a8b18cfb6d fixes some sprites, adds a thin blindfold 2021-01-14 01:36:29 +00:00
H0lySquirr3l
77b0412acd Update snacks.dm 2021-01-10 15:48:45 -06:00
H0lySquirr3l
4daa8ab0a4 Update recipes_microwave.dm 2021-01-10 15:48:42 -06:00
Killian
831bd6861b corpse landmarks update (#7801) 2021-01-09 21:57:01 -09:00
Mechoid
89adcb02be Blob Genesis (#7781)
* Allows the regeneration of blobs from the core chunks they leave behind on death.

* Blobtalk.

* Font
2021-01-09 21:38:18 -09:00
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