Commit Graph

19099 Commits

Author SHA1 Message Date
Atermonera
02c0e634bb Merge pull request #6436 from Cameron653/Boot_Fix
Fixed an issue with multiple boot/shoe overlays.
2019-09-07 19:10:20 -08:00
TheFurryFeline
96e9358564 Orange Is The New Orange Part 2
Refactors prison jumpsuit slightly to not be a child of the orange jumpsuit, which in turn gets its own sprite. Left/right hand uniforms don't seem to be applying in-game when carrying the suits but that's not too bad of an issue. Uniform on the mob shows properly and works with sleeves rolled and uniform rolled down.
2019-09-07 12:30:41 -04:00
Heroman
3fb167f95d Fixes solar panel assembly dupe 2019-09-07 13:44:36 +10:00
Heroman
623da007a8 Fixes some lost drone laws not ever applying 2019-09-06 16:12:08 +10:00
Cameron Lennox
960afd4121 Fixes the washing bug with boots. 2019-09-03 01:34:43 -04:00
Heroman
4c5c3d4bf9 Makes friendly viscerators not attack wards 2019-09-01 14:45:46 +10:00
Atermonera
7bd204fc32 Merge pull request #6426 from Heroman3003/rigruntime
Fixes rig gauntlets runtime
2019-08-31 14:13:49 -08:00
Atermonera
6ddd64be71 Merge pull request #6433 from Heroman3003/spawnfix
Fixes one of the Cancel buttons on Spawn Character not working
2019-08-31 14:11:44 -08:00
Atermonera
f5b83a76a9 Merge pull request #6432 from Heroman3003/hullmat
Makes hull materials behave more uniformly
2019-08-31 14:11:20 -08:00
Atermonera
c8781775ee Merge pull request #6430 from Heroman3003/strangerock
Refactors strangerocks not to be ore
2019-08-31 14:08:21 -08:00
Atermonera
49a8e3b2ae Merge pull request #6428 from Screemonster/icastfist
glove attack refactor
2019-08-31 14:07:51 -08:00
Novacat
7f49c680e5 Ports MREs from Baystation (#6424)
* Ports MREs from Baystation

- Ports MREs from Baystation
- Adds an 'Emergency ration' that contains liquidfood rations
- Two new ration packs that have the new rations.

* Placates travis

* Lynxlog

* Adds liquidprotein rations

* Sacrifice for travis

* Changes desc

* Fixing missing filling in crayon paste

* Fixes missing side for random rations

* Renames Paste Supplypack

* aaaaa minor error

* Slight organization

* Fixes some errors

* Why am I like this
2019-08-31 14:00:14 -08:00
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
Screemonster
d052b56ef3 replace 0 and 1 with true and false 2019-08-30 22:15:02 +01:00
Screemonster
9cbfca05c9 added istype check for runtime protection 2019-08-30 21:42:03 +01:00
Heroman
b7ce760d6d Fixes one of the Cancel buttons on Spawn Character not working 2019-08-31 05:14:30 +10:00
Heroman
e74cfd7c0c Makes hull materials behave more uniformly 2019-08-30 09:10:18 +10:00
Heroman
d8918a6af2 Refactors strangerocks not to be ore 2019-08-29 08:32:31 +10:00
Heroman
daadfd6a72 Fixes editing colony director IDs editing global 'station access' list 2019-08-28 19:02:35 +10:00
Screemonster
613621ee52 de-scottishifies comments 2019-08-28 08:11:53 +01:00
Screemonster
d808286f3c glove attack refactor 2019-08-28 07:56:23 +01:00
Heroman
c3bd8e92a3 Fixes rig gauntlets runtime 2019-08-27 15:57:35 +10: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
Atermonera
440b9e5cc3 Merge pull request #6415 from Heroman3003/bellfixes
Adjusts some desk bell mechanics
2019-08-23 17:42:04 -08: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
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
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
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
5ac0a74b5a Makes airtight plastic flaps unconstructable 2019-08-13 21:58:43 +10:00
Heroman
e15b580621 fixes language runtime upon ai creation 2019-08-13 21:50:23 +10: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