Commit Graph

29526 Commits

Author SHA1 Message Date
Cameron Lennox
aae2e66755 Fixed an issue where boot/shoe overlays would magically be cleaned by putting in a knife and stepping on blood. 2019-08-31 14:30:58 -04:00
Anewbe
9b5573eee6 Merge pull request #6429 from Heroman3003/idfix
Fixes editing colony director IDs editing global 'station access' list
2019-08-29 17:26:45 -05:00
Heroman
c1ec00ef62 Undoes unnecesary Copy() 2019-08-28 19:03:01 +10:00
Heroman
daadfd6a72 Fixes editing colony director IDs editing global 'station access' list 2019-08-28 19:02:35 +10:00
Atermonera
95d6dd7eb6 Merge pull request #6423 from chaoko99/stomach_pump
Ports Bay's stomach pump.
2019-08-27 21:25:06 -08:00
Atermonera
8f85cb4387 Merge pull request #6418 from MisterLayne/glass_shard_self_harm
Shards Do Damage to Holder
2019-08-27 21:23:52 -08:00
Atermonera
c9247016bc Merge pull request #6417 from MisterLayne/conductivity_fix
Non-conductive Things Do Not Conduct
2019-08-27 21:23:34 -08:00
Atermonera
2aaf17835c Merge pull request #6420 from Mechoid/WhyAmILikeThis
Fix SLED infinite looping.
2019-08-26 19:31:21 -08:00
Atermonera
b9fa742db0 Merge pull request #6419 from Mechoid/PrinterHREF
Should solve the I.C. printer HREF exploit.
2019-08-26 19:31:09 -08:00
MisterLayne
13a221cf5b Adds changelog. 2019-08-26 10:02:50 -04:00
MisterLayne
e892f25e3d F i n a l l y. 2019-08-26 09:55:59 -04:00
chaoko99
8e37b06da6 adds stomach pump 2019-08-24 12:07:35 -07:00
Atermonera
440b9e5cc3 Merge pull request #6415 from Heroman3003/bellfixes
Adjusts some desk bell mechanics
2019-08-23 17:42:04 -08:00
MisterLayne
5a21f6dc57 Still complete garbage. 2019-08-23 14:35:20 -04:00
MisterLayne
382f04898a A mangled and unfinished shitstorm of code. 2019-08-23 14:26:44 -04:00
Mechoid
87386f4a70 Un-double the used_weapon, one is fine. 2019-08-23 10:55:16 -07:00
Mechoid
c34ba08b57 Should solve the I.C. printer HREF exploit. 2019-08-23 10:25:35 -07:00
Atermonera
48abd9c730 Merge pull request #6414 from InterroLouis/Typo-Fix
Rigsuit Typo Fix
2019-08-22 19:38:07 -08:00
MisterLayne
7d4c49f45e Praise limb-stump jesus! 2019-08-22 10:37:23 -04:00
Heroman
c01ba2b973 Adjusts some bell mechanics 2019-08-22 15:38:52 +10:00
Unknown
8833dfe458 Feedback for transferring points 2019-08-21 20:14:01 -04:00
InterroLouis
7505c9cb59 Update rig_attackby.dm 2019-08-21 20:02:06 -04:00
Unknown
2d6445f31f Fixes Exploration Vendor Bugs
*lynx noises*
2019-08-21 19:46:31 -04:00
Atermonera
0069b9d980 Merge pull request #6396 from Mechoid/ChemistryAdvancement
Chemistry Expansion
2019-08-21 13:42:08 -08:00
Atermonera
820717b10e Merge pull request #6410 from Mechoid/PrometheanOrgans1
Promethean Organ Tweakening
2019-08-21 13:40:09 -08:00
Atermonera
9076f1f739 Merge pull request #6407 from Nalarac/Turret
Adds Setting for Turrets to Shoot Downed People
2019-08-21 13:29:42 -08:00
Atermonera
cd77ce7090 Merge pull request #6397 from Mechoid/BerserkUnblinding
Blind rage doesn't mean actually make them blind.
2019-08-21 13:28:46 -08:00
Atermonera
1c90e21c38 Merge pull request #6402 from Woodratt/08092019_uniformstuffphase1
Uniform Adjustments Phase 1
2019-08-21 13:26:02 -08:00
Mechoid
f294be6c56 Exploration Expansion 1: Or, How I Learned To Love The Tree (#6358)
* Mechoid code everything!

* Telecube

* Adds 2 PoIs

* H u g e commit.
2019-08-21 13:21:33 -08:00
Mechoid
dbcf501a5a Promethean Organ Additions 2019-08-19 17:56:37 -07:00
Atermonera
c2e4a44045 Merge pull request #6408 from Heroman3003/jump-fix
Fixes ghost jump-to-mob
2019-08-18 21:06:41 -08:00
Atermonera
1fe1c4c110 Merge pull request #6406 from Heroman3003/fish-reciper-fixes
Makes magic creation of carpotoxin via cooking impossible
2019-08-18 21:04:30 -08:00
Atermonera
0eb2af0973 Merge pull request #6405 from Nalarac/patch-1
Changes Hooligan Crab Meat to Crab Meat
2019-08-18 21:03:07 -08:00
Heroman
1e061c4c2e Moves the input slightly 2019-08-18 06:46:28 +10:00
Heroman
8020b0cb20 Fixes Ghost jump-to-mob 2019-08-18 06:33:50 +10:00
Nalarac
5aeba5e1e7 Makes check_down independent of lethal 2019-08-16 15:18:53 -05:00
Nalarac
a99a767d57 Adds Setting for Turrets to Shoot Downed People
The turret will only shoot downed individuals with this setting enabled AND set to lethal.

This was the compromise decided upon in the last staff meeting.
2019-08-14 11:50:24 -05:00
Heroman
da32ae5b35 Makes magic creation of carpotoxin via cooking impossible 2019-08-14 11:04:45 +10:00
Andrew
eadff9b46d Changes Hooligan Meat to Crab Meat
Title
2019-08-13 09:32:50 -05:00
Heroman
e15b580621 fixes language runtime upon ai creation 2019-08-13 21:50:23 +10:00
Anewbe
afe9accf94 Merge pull request #6381 from Nalarac/CableLayer2
Fixes Mech Cable Layer
2019-08-12 15:33:07 -05:00
Anewbe
8d9aeea847 Merge pull request #6390 from Heroman3003/bot-patrols
Makes bot patrolling into a map var
2019-08-12 15:30:41 -05:00
Atermonera
8b11946e67 Merge pull request #6386 from TheFurryFeline/TFF-Orange_Is_The_New_Orange
Freebie Orange Jumpsuit
2019-08-12 10:39:30 -08:00
Woodratt
b853e2933b Uniform Adjustments Phase 1
To help break up the uniform.dmi into smaller chunks so we can add more stuff.

- Made the solgov uniforms use the accessories system for denoting department instead of having several different sprites in the uniform dmi folder. (Stuff was already ported from Bay just not linked together.)
- Removed redundant solgov uniforms from uniform.dmi and moved the sprites for the solgov uniforms to their own dmi.
- Fixed storage vests and drop pouches disappearing when one rolls down a uniform.
2019-08-09 17:41:51 -07:00
Shophaune
fd9e7e2e2b Maybe fixes drone hat issues
Updates this proc to current Baystation code. Either they have broken hats there or this will fix the bug - if it doesn't can someone who knows what they're doing please look into this? Maybe you, if you're reading this description?
2019-08-09 20:46:48 +01:00
Andrew
fcc8242aaa Allows Construction of Serenity in Robotics (#6380)
Put Misty as author in changelog since I'm only removing the comments.

Notes for balancing decisions:
Chassis costs 2 sheets of phoron (and some steel)
All gygax parts that go on only cost steel/glass
Instead of the gygax's diamond armor plating, it uses 5 plasteel
The "targetting" board costs the same as a standard board (glass and acid)
2019-08-08 13:26:39 -07:00
Atermonera
73d42893da Merge pull request #6387 from Heroman3003/ahelp-feedback
Makes ahelping on existing ticket give proper feedback
2019-08-08 12:08:36 -08:00
Atermonera
8316113fa0 Merge pull request #6393 from Nalarac/Conductivity
Adds NOCONDUCT to Some Items
2019-08-08 12:07:10 -08:00
Mechoid
e1e5c28981 Blind rage doesn't mean actually make them blind. 2019-08-07 21:55:59 -07:00
Mechoid
8ae2cae804 Fixfix some last minute things. 2019-08-07 21:40:05 -07:00