Commit Graph

95 Commits

Author SHA1 Message Date
oranges
e55d3dcd52 Merge pull request #19304 from lordpidey/flyswatters
Flyswatters
2016-07-17 11:51:57 +12:00
bawhoppen
7830992c11 Makes shuttles superficially buildable (#18974)
Added two new materials, Titanium and plastitanium. Titanium is naturally occuring, and plastitanium is an alloy made of plasma and titanium.
These materials can be used to build shuttle walls and floors, though this serves no current purpose.

Before you yell "SNOWFLAKE" about the materials, I have definite planned purposes for them, not to mention what else they could be potentially used for (mechs, R&D, etc.)
You can use titanium to make white shuttle walls that smooth (like the ones of the escape shuttle), and plastitanium to make the grey syndie shuttle walls. You can also make floor tiles out of each material for the different shuttle floors. This PR itself doesn't change any of the paths on the map to use smoothed shuttlewalls and I'll save that for a seperate PR.

Also this PR makes ORM code better and allows people to easily add new alloys

Sprites by WJ
2016-07-14 21:25:49 +12:00
Mike Long
f1a1cafed4 Adds flyswatters.
They are availible in beekeeping crates.
They instantly kill bees, and deal large damage to flypeople, and negligible damage to non-flypeople.
2016-07-12 19:47:03 -04:00
Jack Edge
05eed7fe4d Fixes bug with Centcom shuttle loan 2016-07-03 21:40:55 +01:00
Jack Edge
042caf0c2a Cargo shuttle now works again 2016-07-02 18:29:36 +01:00
oranges
f888c516f3 Merge pull request #18942 from coiax/free-the-export
Exports no longer need to be inside storage containers
2016-06-28 22:00:35 +12:00
Profakos
1c239e57fd Fixes duplicate export type names (#18944)
The export datums for bomb, bio and radsuits and -helmets were all had the same name, this fixes that.
2016-06-28 22:00:07 +12:00
Jack Edge
1dc2950eb9 Fixes all bugs; exports now work 2016-06-26 20:08:50 +01:00
Jack Edge
ba673a04d1 Removes requirements for exports to be contained
🆑 coiax
rscadd: All items in the supply shuttle are processed for export,
irregardless of whether they are in a container or not.
/🆑
2016-06-26 12:40:13 +01:00
oranges
ca7067eded Merge pull request #18741 from KorPhaeron/tacticalespionageaction
Tactical Espionage Action
2016-06-22 12:08:05 +12:00
oranges
12b8b1a9b2 Merge pull request #18735 from coiax/emergency-drone
Adds Drone Shells to Emergency cargo packs
2016-06-22 09:04:13 +12:00
KorPhaeron
74e451e7ce Sneaking Mission 2016-06-19 14:39:39 -05:00
coiax
961a6c4c26 Adds potted plants to cargo packs (#18662)
🆑 coiax
rscadd: Potted plants can now be ordered from cargo.
/🆑
2016-06-19 14:05:18 -05:00
Jack Edge
1cb8a23a3c Adds Drone Shells to Emergency cargo packs
🆑 coiax
rscadd: Drone shells can be ordered in Emergency supplies at Cargo.
/🆑

- 3xdrone shells for 1000 credits. Ghosts get notified as normal when
the shuttle leaves Centcom (because that's when the items get made).
2016-06-19 12:35:34 +01:00
KazeEspada
15184f5aa9 Fixes Randomized Crates
Fixed issue #15956

Randomized crates now give the correct number of items down from all the items.
2016-06-15 21:50:15 -07:00
lordpidey
f640d7ddb7 Devil fixes (#18520)
Numerous small fixes/changes/balances to devils.

Notable changes:
It now requires more souls to increase. It is now 3,7,12 souls, up from 3,6,9.
Devils now have extra rules, no coercing into signing contracts with violence, and no intentionally physically harming another devil.
Burial garment banishment now works on true devils. <--- Unreported issue, can I use that fix for the mergetoken?
Renamed all demon files to devil
Updated religious supplies to have burial garments.
Burial garments re-added to box/meta
Increased infernal fireball cooldown
Soulsellers can now use a pitchfork without being harmed.
Added new book crate, which includes a codex gigas to cargo.
2016-06-14 15:43:33 +12:00
oranges
eb30d5c84e Merge pull request #18242 from LatD/machineprototype
Item to cargo for R&D engineering tech
2016-06-13 14:08:05 +12:00
LatD
5ecf4f2725 Raise the cost for now 2016-06-11 17:51:40 +03:00
oranges
a08cff21f0 Merge pull request #18345 from TechnoAlchemisto/glass_bottles_don't_break_on_heads_as_easily_as_in_the_movies_I_would_know
Renames and relores loyalty implants to mindshield implants.
2016-06-09 15:39:53 +12:00
Core0verload
3af3bd2938 R&D machinery refactor (#18295)
* RnD machinery refactor

* Small changes

* Removed designs selling
2016-06-08 17:18:22 +12:00
TechnoAlchemist
154982500b God is good. 2016-06-07 04:54:06 -07:00
oranges
9d6936a607 Merge pull request #18197 from pudl/tank
adds high-capacity watertanks
2016-06-07 13:01:16 +12:00
LatD
f2e0342ca9 Add machine prototype to cargo 2016-06-04 18:52:00 +03:00
coiax
64c19bd2d3 Adjusts RCD family export prices to be realistic (#18186)
Fixes #18101. Comments indicate my rough logic, which brings them inline
with the actual cost of materials required to create them, rather than
x10 the amount.

Also still enables their sale rather than just crudely removing them
entirely.
2016-06-03 14:45:04 -05:00
Jordie
4c8f8ae53e Merge pull request #18154 from PKPenguin321/plant-analyzer-repath
Repaths plant analyzers
2016-06-03 16:41:02 +10:00
pudl
9b4bb04a61 adds tank 2016-06-02 22:07:23 -05:00
Razharas
9fdae2fe4e Merge pull request #17576 from LatD/Research
[Ready for test/merge] R&D level remake
2016-06-02 18:41:43 +03:00
PKPenguin321
cf71a5833f repaths plant analyzers
so they are no longer children of regular analyzers
2016-06-01 22:44:03 -07:00
Cheridan
9b8c68e704 Merge pull request #18065 from coiax/blood-box
Adds "blood freezer" to map; replaces freezer of blood packs
2016-06-01 00:51:52 -05:00
lordpidey
4b586501b0 Toy cargo crate now contains proper stack of space carpet. (#18057) 2016-05-31 02:16:44 -05:00
Jack Edge
37acbe9990 Adds "blood freezer", adds to map
No actual changes to the maps themselves, just moving
the bloodpack spawns from map into code.
2016-05-31 00:49:42 +01:00
LatD
907fc36e5c Merge remote-tracking branch 'refs/remotes/tgstation/master' into Research 2016-05-24 22:17:44 +03:00
Jack Edge
c5a0f8621b Adds stat tracking to cargo
- "export_sold_amount", "object.type|numbersold"
- "export_sold_cost", "object.type|totalcreditsgained"
- "cargo_imports", "pack.type|pack.name|pack.cost" (called for each
crate that is bought)
2016-05-17 06:29:42 +01:00
AnturK
a9b26391e9 Merge pull request #17654 from coiax/fix-17624
Fix #17624; shuttle loan checks for banned items
2016-05-15 14:59:42 +02:00
Daturix
514047f8d8 Tesla gen to cargo orders (#17628) 2016-05-14 07:02:23 -05:00
Jack Edge
e5639e3874 Fix #17624; shuttle loan checks for banned items
- Shuttle now peforms standard no mobs, nuclear disks, etc. checks when
sending the shuttle for a loan to Centcom.
2016-05-14 12:07:44 +01:00
Jack Edge
889c7240f0 Merge branch 'master' into voiced-skeletons 2016-05-13 18:37:23 +01:00
LatD
e685d82805 Removing reliability 2016-05-12 02:43:18 +03:00
Joan Lung
a4f1318d88 Merge pull request #17496 from coiax/pie-pie-pie
Cream pie map edits
2016-05-10 11:06:41 -04:00
Jack Edge
4e0ffcca23 Contraband clown pie crate 2016-05-09 00:32:14 +01:00
Jack Edge
84748850a9 Bureaucracy crate includes APPROVED/DENIED stamps 2016-05-08 18:24:21 +01:00
Jack Edge
fa77a4e43e Merge branch 'master' into voiced-skeletons 2016-05-08 15:23:26 +01:00
Core0verload
a66c2f4418 Machine/computer boards and frames refactor (#17300)
* Map Changes

* Machine/console boards and frames refactor

* More board changes
2016-05-08 12:11:18 +02:00
Core0verload
ea655923bc Can screwdriver swarmer shells to disable them (#17202)
* Adds 1 new ways to destroy inactive swarmer shells

* Swarmers are now exportable

* Feedback messages
2016-05-07 23:21:09 -05:00
Jack Edge
8260743465 Oh-cee, the original content skeleton
🆑 coiax, Nienhaus
rscdel: Unfortunately, the Belowyarn toys have been withdrawn from use
due to Assistants choking on the batteries. Centcom has sent their
condolences to the battery manufacturing plant.
rscadd: We are introducing Oh-cee the original content skeleton figurines.
Pull its string, and hear it say a variety of phrases. Not suitable for
infants or assistants under 36 months.
tweak: Note that pulling the string of all talking toys is now visible
to others.
/🆑

With thanks to Nienhaus for doing the sprite.

- The toy AI has also been made a "talking" toy because it works the
  same as the others.
2016-05-06 09:16:40 +01:00
phil235
524a55a757 Merge branch 'master' of https://github.com/tgstation/-tg-station into Dismemberment
Conflicts:
	code/datums/martial.dm
	code/game/gamemodes/changeling/powers/fleshmend.dm
	code/modules/mob/living/carbon/carbon.dm
2016-05-05 21:57:10 +02:00
phil235
68da092009 Dismemberment port from Hippie code, based on RemieRichard's work. Big thanks to RemieRichards and crystalwarrior. 2016-05-05 18:17:51 +02:00
Aloraydrel
309dbe9786 Adds art supplies to cargo 2016-05-04 09:11:57 -05:00
Jack Edge
086eb03c1a Adds collectable HoP hat
- Switches reskinned HoS hat in museum in MetaStation to use HoP hat
 - Adds HoP hat to cargo
 - Collectable HoP hat able to be worn by corgis
2016-05-02 11:37:39 +01:00
Cheridan
fbd16c77cd Merge pull request #16934 from Core0verload/cargo
Changes to Stocks Console UI, cargo fixes
2016-04-28 23:22:17 -05:00