Commit Graph

10269 Commits

Author SHA1 Message Date
AnturK e50b647ea4 Fixes autosurgeon icon (#37402)
* Fixes autosurgeon icon

* Duh
2018-04-24 16:03:33 -05:00
Jordan Brown 651b9510f9 Merge pull request #37390 from Mickyan/snacks_contents
Adds salt to chips and jerky
2018-04-24 15:55:12 -05:00
kevinz000 42d0541a28 fixes cqc working outside chef assigned areas (#37375)
* cqc

* Update martial.dm

* Update cqc.dm

* Update cqc.dm

* Update human_defense.dm

* Update human_defense.dm

* Update human_defense.dm
2018-04-24 10:23:34 -05:00
Dax Dupont 5014bdf6ee Improves logging/messaging for singularities. (#37411) 2018-04-24 10:19:14 -05:00
AnturK 1ba045e5f5 Fixes brain tumor. Again. (#37378) 2018-04-24 09:58:36 -05:00
Dax Dupont e748439b15 Fixes duplicate logic causing doors to be perma stuck on mike pence mode. (#37379) 2018-04-24 08:14:12 -05:00
kevinz000 3c36c1acfc GetFlatIcon fix (#37371) 2018-04-24 07:20:39 -05:00
Dax Dupont d5c2d37e39 Makes radiation collectors buildable (#37363)
* Makes radiation collectors buildable

* capitalism at it's finest

* a
2018-04-24 07:13:16 -05:00
Dax Dupont a88caf87aa Fixes cargo scanner being invis. 2018-04-23 18:28:41 -05:00
81Denton 8fdc520031 Adds multilayer pipe subtypes for mapping (#37341)
* adds multilayer pipe subtypes for mapping

* replaces values with defines
2018-04-23 10:33:20 -05:00
Jordan Brown 8587e3f792 Merge pull request #37365 from DaxDupont/fueltank-logging
Improves fuel tank explosion logging
2018-04-23 09:40:55 -05:00
Jalleo ac8b645461 Desc fix (#37308)
* Removes a unused helper

* Fixes a description so people stop getting confused with certain mining upgrades.

* Updates to say research console.

* missed a dot.

* My bad.
2018-04-23 09:20:15 -05:00
Noka 881331e232 test (#37263) 2018-04-23 09:06:42 -05:00
Jordan Brown 1cdea15616 Fixes ghosts being unable to see into nonadjacent bags 2018-04-23 09:03:27 -05:00
Jordan Brown e52fafcbb7 Merge pull request #37364 from Jalleo/Inducer_change
Removes the ability for inducers and circuits to charge energy weapons.
2018-04-23 08:47:55 -05:00
Jordan Brown 0127fa02cd Fixes toolbelts holding everything 2018-04-23 08:30:08 -05:00
vuonojenmustaturska c7e3b72888 It started in a tavern on the edge of Macke town (#37362) 2018-04-23 07:35:09 -05:00
Poojawa 0d5d992732 compile fixes + initial map port 2018-04-23 03:37:10 -05:00
Poojawa 832f071b59 mob stuff 2018-04-23 02:26:53 -05:00
AnturK 1d3f9bd4ec Fixes thermite immunities (#37359) 2018-04-23 02:06:22 -05:00
Poojawa 5518efebea everything but mob stuff 2018-04-23 01:06:17 -05:00
Poojawa cc6b320f83 game folder 2018-04-23 00:17:28 -05:00
Poojawa e5f9765d2a datums/controller stuff 2018-04-23 00:02:42 -05:00
Poojawa f2b0456dc5 defines, helpers, onclick 2018-04-22 23:56:25 -05:00
LetterJay e97db8a33c Merge pull request #6481 from Citadel-Station-13/upstream-merge-37339
[MIRROR] Fixes a lack of feedback when entering too many points for the gulag.
2018-04-22 22:23:07 -05:00
LetterJay 86e3cac966 Merge pull request #6480 from Citadel-Station-13/upstream-merge-37324
[MIRROR] Makes engine goggle numbers more visible
2018-04-22 22:22:38 -05:00
LetterJay fb267270ec Merge pull request #6478 from Citadel-Station-13/upstream-merge-37315
[MIRROR] Gives beer and soda dispensers their own circuitboards and Design ID's
2018-04-22 22:22:03 -05:00
LetterJay de2ab536d1 Merge pull request #6477 from Citadel-Station-13/upstream-merge-37320
[MIRROR] Fixes pAI's breaking drone static.
2018-04-22 22:21:45 -05:00
LetterJay f3fb253713 Merge pull request #6476 from Citadel-Station-13/upstream-merge-37321
[MIRROR] Fixes CTF cheating
2018-04-22 22:21:21 -05:00
LetterJay 8170e2b6c1 Merge pull request #6475 from Citadel-Station-13/upstream-merge-37314
[MIRROR] Mapping component helper
2018-04-22 22:20:58 -05:00
LetterJay 4226fa8b27 Merge pull request #6474 from Citadel-Station-13/upstream-merge-37305
[MIRROR] Adds a note if the loaded away mission is custom in the logs.
2018-04-22 22:20:39 -05:00
LetterJay 7bf8b9654e Merge pull request #6473 from Citadel-Station-13/upstream-merge-37306
[MIRROR] Fixes falsewall letting through air.
2018-04-22 22:20:22 -05:00
LetterJay 174a1d01ab Merge pull request #6472 from Citadel-Station-13/upstream-merge-37310
[MIRROR] Fixes and optimises apc_control.dm a tad.
2018-04-22 22:20:01 -05:00
LetterJay 7f90eaf89c Merge pull request #6471 from Citadel-Station-13/upstream-merge-36270
[MIRROR] [READY] A few additions, tweaks, and fixes for integrated circuits
2018-04-22 22:19:28 -05:00
LetterJay 73e798b281 Merge pull request #6470 from Citadel-Station-13/upstream-merge-37304
[MIRROR] Fixes buildmode trying to build in nullspace.
2018-04-22 22:19:06 -05:00
LetterJay 7cc2aeea8f Merge pull request #6469 from Citadel-Station-13/upstream-merge-37301
[MIRROR] Flatten the map transition edges
2018-04-22 22:18:47 -05:00
Dax Dupont af48fe9dcf Fixes a lack of feedback when entering too many points for the gulag. (#37339) 2018-04-22 19:42:47 -05:00
KorPhaeron b36d88900f Makes engine goggle numbers more visible (#37324) 2018-04-22 19:21:13 -05:00
iksyp e8698ab798 Gives beer and soda dispensers their own circuitboards and Design ID's (#37315)
* new boards

* new boards installed

* new designs (wow) (woah)

* added the new design ids to the biotech node

* tested

it works, also, that typo fucking stopped it from compiling
2018-04-22 19:19:51 -05:00
AnturK e36c44be5c Fixes pAI's breaking drone static. (#37320) 2018-04-22 19:19:43 -05:00
KorPhaeron 0c6aea73d3 Can't push CTF flag carriers (#37321) 2018-04-22 19:19:32 -05:00
AnturK 8a3caaae6b Mapping component helper (#37314)
* Mapping component helper

* GetAllContents so you can manipulate things in crates/onmobs/whatever

* More verbose warning.
2018-04-22 19:18:17 -05:00
AnturK 54ef24b75a Adds a note if the loaded away is custom or not in the logs. (#37305) 2018-04-22 19:17:05 -05:00
AnturK 1c390cbbc5 Fixes falsewall letting through air. (#37306)
* Fixes falsewall letting through air.

* define
2018-04-22 19:15:51 -05:00
Jordan Brown 70a0db6173 Merge pull request #37310 from Jalleo/apc_control_changes
Fixes and optimises apc_control.dm a tad.
2018-04-22 09:31:10 -05:00
LetterJay e022564fca Merge pull request #6467 from Citadel-Station-13/upstream-merge-37300
[MIRROR] fixes skateboards giving infinite metal
2018-04-22 02:47:07 -05:00
LetterJay 2b70e9a3ae Merge pull request #6466 from Citadel-Station-13/upstream-merge-37312
[MIRROR] [s] You can no longer buckle anchored mobs to things.
2018-04-22 02:46:53 -05:00
LetterJay 3966683e17 Merge pull request #6460 from Citadel-Station-13/upstream-merge-37280
[MIRROR] Removes random spawn
2018-04-22 02:46:38 -05:00
LetterJay 930c9bf58c Merge pull request #6459 from Citadel-Station-13/upstream-merge-37281
[MIRROR] Removes old decal system
2018-04-22 02:46:25 -05:00
LetterJay 52a8708cb7 Merge pull request #6458 from Citadel-Station-13/upstream-merge-37237
[MIRROR] Fix cycle-linked airlocks on shuttles
2018-04-22 02:46:01 -05:00