Fox-McCloud
7861df4dbe
Improves Drinking Glass Colorization
2017-03-28 18:49:01 -04:00
Crazy Lemon
09f7b52f3b
Merge pull request #6906 from Fox-McCloud/merge-oddities
...
Fixes Stack Merge Oddities
2017-03-26 23:27:58 -07:00
Fox McCloud
f7f127042c
Merge pull request #6679 from Kyep/terrorspiders-PR5
...
Terror Spiders 5 - Fixes & Tweaks II
2017-03-27 02:27:19 -04:00
Fox McCloud
3e8244c244
Merge pull request #6932 from uraniummeltdown/metastation
...
Metastation Fixes
2017-03-26 19:34:38 -04:00
Fox McCloud
88ae43709f
Merge pull request #6913 from SamHPurp/Unlocked-APCs
...
Quality of Life: Newly built APCs come unlocked.
2017-03-26 18:24:10 -04:00
Fox McCloud
031fcf3b0e
Merge pull request #6533 from Kyep/gateway_centcomaway
...
Tweaks Centcom away mission to make it viable
2017-03-26 18:23:21 -04:00
Fox McCloud
238b79060c
Merge pull request #6758 from FlattestGuitar/outfiterinos
...
Touches up the admin outfits. 🤳
2017-03-26 18:15:55 -04:00
Fox McCloud
9e52b87833
Merge pull request #6919 from TravellingMerchant/master
...
Adds a new set of cyberlimbs/IPC parts.
2017-03-26 18:14:22 -04:00
Fox McCloud
9e27d915d7
Merge pull request #6907 from FalseIncarnate/botany2
...
Don't Fear the Reaper
2017-03-26 18:12:52 -04:00
FalseIncarnate
2d4e7d88ee
CanPass tweak
2017-03-26 00:06:00 -04:00
FlattestGuitar
4445a34650
Merge branch 'master' into outfiterinos
2017-03-25 21:20:51 +01:00
FalseIncarnate
dfc56148d3
soil CanPass() override
...
Small piles of dirt are no longer going to stop you from your botanical
machinations.
2017-03-25 14:00:01 -04:00
FlattestGuitar
c0ac235704
Touching up the admin outfits...
2017-03-25 18:45:36 +01:00
uraniummeltdown
d592cf2dc2
Adds Armsky object; meeting room area icon; fixed layering of firelocks, windoors and shutters, shutter directions on meta; icon edited airlocks replaced with proper types on meta; drone console now checks area instead of oview(3); meta pod keys now work on sec pod; fixed meta command hallway vendors areas; added tiny fans to mass drivers on meta; fixed gateway doors access; fixed meta virology fridge
2017-03-25 17:10:13 +04:00
Crazylemon64
009c0f9c3c
Pens no longer use comic sans
2017-03-25 02:57:32 -07:00
TravellingMerchant
ef949d273d
Cleans up the code and adds the Shellguard monitor.
2017-03-25 03:14:24 +00:00
TravellingMerchant
740d66f953
Adds the Shellguard parts to the code list.
2017-03-25 03:13:14 +00:00
DaveTheHeadcrab
f11d53a547
Possession Tweaks ( #6848 )
2017-03-24 19:01:31 -04:00
Fox McCloud
f7f91e7c15
Merge pull request #6912 from KasparoVy/underslime
...
Slime people can wear undergarments.
2017-03-24 18:51:50 -04:00
KasparoVy
7ecc21a4ed
Slime people can wear undergarments.
...
I thought I'd fixed this some time ago. Hm!
2017-03-24 17:12:27 -04:00
Sam
1bc17e5b23
Quality of life change + grammar fixes
2017-03-24 21:09:11 +00:00
FalseIncarnate
45354f9ccf
Don't Fear the Reaper
...
Re-adds the admin-spawned Telescopic Scythe
- Originally added in #1025 , this was (probably accidentally) removed
with TG botany.
- Extended tele-scythe damage increase from 13->15 to give it a very
small bonus over the normal scythe in addition to its folding
capabilities
Fixes scythes not properly clearing multiple vines on-hit.
- Telescopic scythes only will do this if extended; they are next to
useless against vines while folded
Added an on-back sprite for the telescopic scythe while extended
(recolored scythe). Folded telescopic scythes worn on the belt do not
have an on-mob sprite.
🆑
rscadd: Re-adds the telescopic scythe, the pinnacle of covert reaping
technologies. Currently admin-spawn only, for use in the most dire of
harvest times.
bugfix: Scythes (normal and telescopic) should once again clear swathes
through all but the hardiest of vines when in proper reaping
configurations, and heavily damage those they don't outright destroy.
/🆑
2017-03-24 04:58:01 -04:00
Fox-McCloud
9ed89ef7cd
Fixes Stack Merge Oddities
2017-03-24 04:44:04 -04:00
Fox McCloud
b8ac385e48
Merge pull request #6798 from Spacemanspark/master
...
Adds a cancel button to the drop bomb command.
2017-03-24 03:49:53 -04:00
Tom Heeren
3dcf322115
Removes the cancel bit
...
Don't need this
2017-03-23 21:55:16 -05:00
Crazy Lemon
87e4993152
Merge pull request #6717 from Fox-McCloud/laser-scalpel-refactor
...
Fixes Power Tools Materials and Recators Laser Scalpels
2017-03-23 15:20:56 -07:00
Tom Heeren
879a8507e4
Makes code better and shit
...
reeeeeeeeeeeeeeeeeee
2017-03-23 16:04:12 -05:00
Fox McCloud
2ca8e10918
Merge pull request #6699 from FalseIncarnate/fish
...
Refactors Fish
2017-03-23 16:02:27 -04:00
Fox McCloud
b0dc4ccab2
Merge pull request #6738 from uraniummeltdown/shadowshroom
...
Shadowshrooms + Glowshroom Nerf + Station Lighting Nerf
2017-03-23 12:39:36 -04:00
uraniummeltdown
0f5c0e40e2
nerf station lighting along with shadowshroom glow power, fix shroom spreading, endurance fix
2017-03-23 14:12:17 +04:00
Crazy Lemon
3959313447
Merge pull request #6850 from MarsM0nd/Switch
...
Conveyor one direction switch
2017-03-23 01:11:11 -07:00
Crazy Lemon
9e0a4eecde
Merge pull request #6858 from Fox-McCloud/autolathe-boost
...
Expands Autolathe Items and Enables Stock Parts
2017-03-23 00:23:27 -07:00
Fox McCloud
d62e35d333
Merge pull request #6647 from Kyep/nerf_chaplain
...
Nerfs Validhunting Chaplains
2017-03-23 00:18:16 -04:00
Fox McCloud
2844a024ab
Merge pull request #6853 from KasparoVy/stuff
...
Fixes #6842 , #6840 and #6839
2017-03-22 17:17:32 -04:00
Fox McCloud
04317e5eb1
Merge pull request #6855 from tigercat2000/PhantasmicDreamy
...
PhantasmicDream Fluff Item: Changeling Hat
2017-03-22 16:05:00 -04:00
Kyep
34e7e395f5
Fixes Terror Queen Hallucinate Spit - now quicker acting, but lasts much less time
2017-03-22 00:56:21 -07:00
FlattestGuitar
55bad2927a
Removes Crazylemon
2017-03-22 08:19:33 +01:00
Crazy Lemon
f60dd39a9d
Merge pull request #6705 from davipatury/crafting-ui
...
Personal Crafting Nano-UI-ification
2017-03-21 18:00:34 -07:00
Fox-McCloud
6e22561208
Expands Autolathe Items and Enables Stock Parts
2017-03-21 20:04:26 -04:00
Tigercat2000
7c2b4c5038
PhantasmicDream fluff item: Witch hat
2017-03-21 15:25:48 -07:00
KasparoVy
b589d5613a
Deconstructing or depowering ORMs/MEVs ejects whatever ID is inside.
2017-03-21 17:44:18 -04:00
KasparoVy
86ddfcb5e9
Fixes Bug with PA Computer Icon
...
Won't render as fully constructed at the start of a round anymore. Now
shoes as an empty frame, as intended.
2017-03-21 15:42:24 -04:00
Fox McCloud
a7138189ce
Merge pull request #6816 from Kyep/ahelp_PP_fix
...
Removes duplicate (PP) from ahelps/mhelps
2017-03-21 15:01:07 -04:00
Fox McCloud
8a257e425e
Merge pull request #6789 from uraniummeltdown/playball
...
Baseball Bats, Baseball Burgers
2017-03-21 14:38:03 -04:00
Mars
3a5b87b00a
Switching logic
...
Any value != 0 is true, and !0 becomes 1, so you were only able to set
the one direction to be forced, and not the other.
2017-03-21 19:18:29 +01:00
Fox McCloud
7b16c169ff
Merge pull request #6494 from Crazylemon64/risky_strange_reagent
...
Strange Reagent is now Riskier
2017-03-21 13:11:29 -04:00
Fox McCloud
31f6bb205a
Merge pull request #6814 from Jovaniph/evaspriteupdate
...
Tajaran EVA Suit Sprites and Minor Updates
2017-03-20 16:41:59 -04:00
KasparoVy
467c7fa1ae
Fixes Glovesnipping
...
Attempting to snip gloves runtimed out because of that accidental
shift-key period business. Works again.
2017-03-20 05:34:25 -04:00
Kyep
e05357d291
Fixes TS category in CS showing with only mindless spiders
2017-03-19 22:18:50 -07:00
Fox McCloud
d0a8a3994d
Merge pull request #6787 from uraniummeltdown/shippingerror
...
Shipping Error
2017-03-19 10:12:48 -04:00
