Commit Graph

29537 Commits

Author SHA1 Message Date
Atermonera
f5b83a76a9 Merge pull request #6432 from Heroman3003/hullmat
Makes hull materials behave more uniformly
2019-08-31 14:11:20 -08:00
Atermonera
6c610020b0 Merge pull request #6431 from Moltenkore/master
Fixed air injectors
2019-08-31 14:09:10 -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
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
e74cfd7c0c Makes hull materials behave more uniformly 2019-08-30 09:10:18 +10: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
Kore
3ef99b8ff2 Fixed air injectors 2019-08-29 20:23:35 +01:00
Heroman
d8918a6af2 Refactors strangerocks not to be ore 2019-08-29 08:32:31 +10: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
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
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