Commit Graph

62 Commits

Author SHA1 Message Date
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
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
Jack Edge
b21bc9ad96 Die commas die 2016-04-28 21:24:30 +01:00
Jack Edge
e01a74f8b8 Blend in with the others 2016-04-28 12:38:47 +01:00
Jack Edge
fa018861e8 New cargo crates to buy
Also some minor spelling fixes I noticed.

🆑 coiax
tweak: Internals Crate now contains breath masks and small tanks.
rscadd: Metal foam grenade box crate added for 1000 points
rscadd: Added two Engineering Mesons to Engineering Gear Crate
tweak: Engineering Gear now costs 1300
rscadd: Breach Shield Generator Crate added for 2500 points
rscadd: Grounding Rod Crate added for 2500 points
rscadd: PACMAN Generator Crate added for 2500
rscadd: Defibrillator Crate added for 1500
rscadd: Nanotrasen Customs report that some wide band suppliers have
been providing "alternative" firing pins. Nanotrasen reminds all
crewmembers that contraband is contraband.
/🆑

Laser tag firing pins (only allow gun to be fired with laser tag armor
of the appropriate colour) added to contraband.
Special clown firing pin (prank your friends) added to contraband.
2016-04-27 16:20:06 +01:00
TechnoAlchemist
d1359a3e09 What's it gonna be, loyalty to me? Or loyalty to your country?
(export datum tweak)
2016-04-24 23:24:42 -07:00
TechnoAlchemist
556f611278 makes the path /animalhide 2016-04-24 22:07:51 -07:00
TechnoAlchemist
581a13975b makes goliath plates stackable. 2016-04-24 21:27:48 -07:00
c0
4d998af43a Changes to Stocks UI, Cargo fixes 2016-04-17 04:40:06 +03:00
Incoming
22c9a1e14d Removes the blatantly copyrighted sans and papyrus action figures and the blatantly copyrighted sounds attached to them.
As a bonus this also makes the project work in the stable 509 build again.

@ChangelingRain NO.
2016-04-16 00:19:35 -04:00
coiax
7f328ba077 Added ORIGINAL CONTENT skeleton toys that chatter when you play with them (#16792)
* Step one, aquire voices for skeletons

* Moved sounds to their own folder

* Added samples of up to ten phomemes long for papyrus

* Added samples of up to ten sans phomemes

* Add skeleton talking

Skeletons now produce audible sound effects representing their distinctive
speech.

* Skeletons now respect punctuation in their chatter

Except for semi-colons, due to HTML escapes of the ' character.

* Lowered volume of skeleton phomemes

* Use Dunc's regex for parsing messages

* Added sans and papyrus toy sprites

Spriting is hard. But I think I managed to crush the images down to fit
in our 32x32 box.

* Generic talking action figures

Talking action figures like the owl figure and the griffin figure are
now generic, and have a pool of messages to pick from. This allows us to
make our TOTALLY ORIGINAL skeleton toys.

* Added the toys to the prize list

No point making these if you can't get them.

* Moved skeleton vocalising code into toys

* Fixes runtimes and bugs with skeleton talk

Remaking the regex each time makes sure it gives output everytime,
and we've also put a check that the item in the list is actually
a number before calling max() that was causing a runtime previously.

* Restored original form of skeleton span picking

Remie's was better.

* More messages for skeleton toys

I think that's probably enough to satisfy me.

* Changed for loop to new style
2016-04-14 09:30:33 -04:00
c0
04f1aafa78 Exports 2016-04-13 06:01:40 +03:00
Jack Edge
bb1e021b95 Added emagging the cargo circuit board
In addition, a circuit once emagged will be unable to return to
only legitimate channels.
2016-04-09 18:32:26 +01:00
Jack Edge
fe07608196 Emagging cargo console also unlocks contraband
Using an emag will also unlock some of the speciality crates that you would
normally have to multitool the cargo circuit board for.
2016-04-09 15:45:01 +01:00
c0
43798574f6 Engineering Crates 2016-04-07 03:26:18 +03:00
bgobandit
0ee9691575 Fixes and standardizes spelling 2016-03-30 04:14:07 -04:00
Cheridan
f04d370659 Merge pull request #16417 from Xhuis/fix_bundle_2
Small fix bundle
2016-03-28 10:39:24 -05:00
KorPhaeron
525cd8afc6 Crate 2016-03-27 14:56:12 -05:00
Xhuis
11e99d4b33 Fixes flasher frame, u. resonator sprites, flasher price 2016-03-27 10:47:18 -04:00
bawhoppen
96fd665676 honk 2016-03-25 23:12:44 -05:00
Lularian
2b700895a8 swat stuff 2016-03-25 22:48:38 -05:00
Remie Richards
496190a4e2 Updates the prices of Bee crates, due to Goofcargo thinking big numbers is ~more fun~ or something. 2016-03-25 14:47:36 +00:00
Remie Richards
b9a2c7fdfe Merge branch 'master' of https://github.com/tgstation/-tg-station into BEES_glorious_BEES
Conflicts:
	icons/mob/head.dmi
2016-03-23 15:41:58 +00:00
AndrewJacksonThe2nd
d70279e203 Merge branch 'master' of https://github.com/tgstation/-tg-station into goon_port 2016-03-22 16:13:17 -07:00
Remie Richards
be0b16a6aa Reagent Bees! Bees come from a beebox and pollinate nearby hydroponics plants, improving the health/yield/removing pests from the plants. While pollinating they build up resources to build honeycomb, honeycomb contains honey (a mild healing reagent that is very nutritious) any spare resources (50 bee_resources) are converted into new bees. honeycombs can be ground up to get the honey and other reagent inside them in an All In One Grinder.
Beeboxes have honey_frames which determine the amount of honeycomb+bees they can maintain.
Bees now have a beegent (Bee reagent, geddit?) that they use during their attacks AND that their produced honeycomb contains, this allows you to farm chemicals using bees.
2016-03-21 04:51:16 +00:00
c0
ed8239d840 Wall mounted flashes are now buildable 2016-03-12 15:14:48 +03:00
AndrewJacksonThe2nd
480583da32 Merge branch 'master' of https://github.com/tgstation/-tg-station into goon_port
Conflicts:
	code/modules/cargo/packs.dm
2016-03-04 23:41:48 -08:00
AndrewJacksonThe2nd
afd0a20432 Goon Port #1: Stock Market 2016-03-04 20:39:27 -08:00
c0
a690abcf92 Plant Refactor: Seeds 2016-03-04 02:35:51 +03:00
Bjorn Neergaard
8e1ec7c2b8 Properly check supply packs validity 2016-02-28 20:26:04 -06:00
tkdrg
bc5c023883 Merge pull request #15809 from bgobandit/bettercontraband
Makes contraband crates great again.
2016-02-28 23:13:55 -03:00
bgobandit
5127ba71fc reverts name change, tweaks cost 2016-02-28 11:01:30 -05:00
bgobandit
7af3e2ce1d oops 2016-02-27 20:15:49 -05:00
bgobandit
6b5379f053 Adds items to contraband crate. 2016-02-27 20:14:16 -05:00
AnturK
b444f4f5da Fixes shuttle loan events not creating crates. 2016-02-27 17:49:09 +01:00