Commit Graph

2619 Commits

Author SHA1 Message Date
Hawk_v3
96b8a7ab95 Merge remote-tracking branch 'upstream/master' 2019-08-17 21:06:48 +01:00
Michiyamenotehifunana
81c56fefd8 Makes Cargo Tugs Great Again (and a minor tweak) 2019-08-16 12:37:08 +08:00
Unknown
98fd57ae3c Final touches 2019-08-15 23:18:05 -04:00
Michiyamenotehifunana
6c8589fa4a Whoops I missed a bit 2019-08-15 22:45:30 +08:00
Michiyamenotehifunana
3a676ad02e Adds Toricrates and stuff 2019-08-15 22:22:28 +08:00
Atermonera
c9e9932182 Merge pull request #6386 from TheFurryFeline/TFF-Orange_Is_The_New_Orange
Freebie Orange Jumpsuit
2019-08-12 14:40:23 -04:00
Hawk_v3
0c85b3a4dd Merge remote-tracking branch 'upstream/master' 2019-08-09 21:35:04 +01:00
Novacat
d844f233c4 Merge pull request #5508 from VOREStation/upstream-merge-6279
[MIRROR] Pipe Clamps, Shutoff Valves, and Leaking Tubes, oh my.
2019-07-30 19:50:02 -04:00
Heroman
54be18505b Removes the leaks and related mechanics 2019-07-31 09:25:07 +10:00
Andrew
e4deaa6478 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 17:00:24 -04:00
Mechoid
5864447d5d 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 04:46:28 -04:00
Hawk_v3
8654b6bdf4 Merge remote-tracking branch 'upstream/master' 2019-07-19 22:05:31 +01:00
Novacat
d48861c7e3 Merge pull request #5469 from VOREStation/upstream-merge-6245
[MIRROR] The great rock update.
2019-07-14 01:36:40 -04:00
Atermonera
22c5967269 The great rock update. 2019-07-13 18:21:45 -04:00
Atermonera
9c8a3803ff Merge pull request #6294 from Heroman3003/plastic-unflap
Makes airtight plastic flaps less of a free pass
2019-07-12 02:52:51 -04:00
Hawk_v3
124afe1cbc Merge remote-tracking branch 'upstream/master' 2019-07-07 18:41:28 +01:00
Heroman
706e75449d Makes trash pile components have random sprites. 2019-07-06 08:06:51 +10:00
Hawk_v3
f7a7183d0e Merge remote-tracking branch 'upstream/master' 2019-07-04 18:16:01 +01:00
Atermonera
1c6ff4f9fd Merge pull request #6263 from Nalarac/patch-6
Nerfs Simple Doors
2019-07-03 23:08:19 -04:00
Anewbe
8f1c86d473 Merge pull request #6259 from Heroman3003/flowerfix
Fixes ppflowers having no icon sometiems
2019-07-03 13:09:35 -04:00
Hawk_v3
bc7ea8379a Merge remote-tracking branch 'upstream/master' 2019-07-02 17:54:29 +01:00
Heroman
2965503cbd Adds new GPSs 2019-07-02 12:04:17 +10:00
Anewbe
d731589ba0 Merge pull request #6238 from Heroman3003/broken-components
QoL improvements for broken components
2019-06-29 04:08:30 -04:00
mistyLuminescence
711e807d32 tinytweaks 2019-06-21 17:07:51 -04:00
Hawk_v3
70a2fa937c Merge remote-tracking branch 'upstream/master' 2019-06-05 00:25:36 +01:00
Atermonera
ddb0b7df2b Merge pull request #6188 from Mechoid/PuzzleFix
Fix Puzzledoors not being locked when no lock is found.
2019-06-04 13:12:22 -04:00
Hawk_v3
7bb9c92c9a Merge remote-tracking branch 'upstream/master' 2019-06-03 12:31:48 +01:00
Atermonera
f78a4e1dc8 Sif Trees and Icon Scaling 2019-05-28 13:21:39 -04:00
Hawk_v3
27e73883fc Merge remote-tracking branch 'upstream/release' 2019-05-04 21:03:48 +01:00
Unknown
07b866b2f8 Last Second Tweaks
- Swaps trash pile money breifcase with something more balanced.
- Adds emergency softsuit box to luxury capsules.
2019-05-03 16:32:21 -04:00
Unknown
043b15ed58 Removes mini translocator 2019-05-03 03:15:42 -04:00
Unknown
27565f4da9 Boxed emergency suits 2019-05-03 03:06:00 -04:00
Unknown
7644861742 ...Eh, this ended up being too strong 2019-05-03 02:34:08 -04:00
Unknown
42c5f0eaa7 Tweaks Trash Pile Loot 2019-05-03 01:10:49 -04:00
Heroman
703c27da7e Refactors shadekin 2019-04-28 15:10:06 +10:00
Heroman3003
e3e715454b Makes placeholder entries for lore writing 2019-04-23 11:13:42 +10:00
Hawk_v3
50e2482613 Merge remote-tracking branch 'upstream/master' 2019-04-22 20:12:14 +01:00
Neerti
cbb56b0546 Merge pull request #6124 from Heroman3003/window-message-fix
Fixes message on window frame fastening
2019-04-22 00:29:26 -04:00
Neerti
90e2d35db0 Merge pull request #6112 from Heroman3003/unredundanting
Removes redundant fix for a bug that never existed
2019-04-20 13:55:08 -04:00
Novacat
e2ae250af5 Merge pull request #5091 from VOREStation/upstream-merge-6101
[MIRROR] Fixes mapping tool icons for fulltile windows
2019-04-18 13:34:12 -04:00
Atermonera
412a870ede Merge pull request #6101 from Heroman3003/icon-window-fix
Fixes mapping tool icons for fulltile windows
2019-04-18 13:19:38 -04:00
Atermonera
836fe2be2b Merge pull request #6100 from Heroman3003/silicate-fix
Fixes silicate making fulltile windows invisible
2019-04-18 13:09:37 -04:00
Neerti
3f7d2a0450 Fixes fireaxe cabinets 2019-04-16 22:00:42 -04:00
RadiantFlash7
44060adba4 Merge pull request #1 from Yawn-Wider/map
Merging fresh upstream changes into my branch
2019-04-14 15:41:12 -04:00
RadiantFlash7
1330ad2a07 Fixing broken code from merge\
Fixing missing map animals and missing icon files.
2019-04-14 15:37:22 -04:00
Hawk_v3
d893b2dd24 Merge branch 'master' into map 2019-04-14 20:07:12 +01:00
Hawk_v3
41f0bd9f6d Merge remote-tracking branch 'upstream/master' 2019-04-14 19:44:13 +01:00
Hawk_v3
8d868fb890 Merge branch 'map' into RadiantMaster 2019-04-14 18:27:05 +01:00
Neerti
fc7c6f38b4 Base features for Precursotech and Anomalotech Expansion 2019-04-13 22:44:52 -04:00
RadiantFlash7
025c358c84 Merge remote-tracking branch 'Repede/master' 2019-04-12 19:54:17 -04:00