Commit Graph

219 Commits

Author SHA1 Message Date
TehZombehz
b4f2533359 Adds some new plushies (#30751)
* Adds some cartoony plushies

Adds some more cartoony plushies and adds them to the toy crate.

* Conflicts 1

* Conflicts 2

* Conflicts 3
2017-09-20 08:53:21 +12:00
Emmett Gaines
76c08c601a New squeaky datum and plushes (#30710)
* New squeaky datum and plushies

new plush subtype
clown shoes, bike horns, and mice slightly changed to use the datum

* narsie and ratvar plushes

* fixes duplicate obj/item/attack_self()

and other misc requested changes

* moves the sounds into initialize
2017-09-18 12:49:03 +02:00
jughu
87c404f672 Adds Lavaland items to weapon exports for cargo (#30403)
They're expensive, but those mobs are quite difficult to kill
2017-09-18 10:25:04 +12:00
kingofkosmos
a479714b5f Adds missing span-endings (#30494)
* Adds missing </span>'s.

* ".name]" --> "]" and
"to_chat(GLOB.admins," --> "message_admins("
and one [name] --> [src]

* Earlier commit was a mistake, lesson learned

* Hopefully all is ok now.

* Revert "Hopefully all is ok now."

This reverts commit 3c95e41b4c13ce96469861e9a97453adf4b56826.

* Revert "Earlier commit was a mistake, lesson learned"

This reverts commit d611af1e4a76690453a7f9808b6e2c429b679f6c.

* Revert "".name]" --> "]" and"

This reverts commit d538b9efef2d7d8be9122bf5ceaf105055059bc6.

* message_admins fix
2017-09-11 14:09:53 +02:00
Militaires
25e309d00a Adds Gondoland and the rare Gondolas (#30530)
A strange race of bear-like beings consisting of a head placed DIRECTLY on a pair of legs, their fur sells for extremely high prices.

The gondoland asteroid is the last natural habitat for these rare creatures.
2017-09-11 08:10:33 +10:00
Kerbin-Fiber
91a9164062 Adds Donksoft Toy Vendor (Machine Board) to the Circuit Imprinter (#30531)
* Automatic changelog generation for PR #30416 [ci skip]

* Update AutoChangeLog-pr-30416.yml

* Update AutoChangeLog-pr-30416.yml

* Update AutoChangeLog-pr-30416.yml

* Update AutoChangeLog-pr-30416.yml

* Automatic changelog generation for PR #30416 [ci skip]

* Delete AutoChangeLog-pr-30416.yml

* Removes riot foam darts from the Donksoft Toy Vendor, however the Syndicate Donksoft Toy Vendor still has riot foam darts.

* Kek

* Changes magazine paths for he Vendors so the Station made one has no riot foam darts at all meanwhile the Syndicate one still has everything just how it is.

* Hopefully fixes this.

* Reee

* Another Fix

* Another Fix, while I'm at it

* My Changelog

* Minor Fixes

* Grammar Fix
2017-09-10 18:42:16 +10:00
XDTM
28a5901170 You can now click on symptoms in the Pandemic to see their description and stats (#29866)
* You can now click on symptoms in the Pandemic to see their description and stats

* Threshold info

* NO WHITESPACE
2017-08-19 19:52:09 -04:00
Ian Turk
7460f2c5b8 Replaced flags with flags_1 2017-08-16 13:01:15 -06:00
Ian Turk
1b7ca8c0e5 Resolved merge conflicts 2017-08-16 08:33:24 -06:00
Jordan Brown
af4d9a85c9 Repaths /obj/item/weapon to /obj/item (#29929) 2017-08-16 10:38:51 -03:00
Ian Turk
371f1ba4f0 Replace all secondary flags with bitflags stored in the flags_2 var 2017-08-15 16:01:35 -06:00
Kyle Spier-Swenson
2faec70007 Fix compile warning 2017-08-14 00:58:15 -07:00
MrStonedOne
d7a507d412 Clean up some inputs 2017-08-13 22:29:58 -07:00
Lzimann
58d0f12c5c Removes a great amount of machinery copypasta with circuitboards.
Also changes New -> Initialize in most of them.
renamed: `code/game/machinery/computer/computer.dm` -> `code/game/machinery/computer/_computer.dm`
renamed: `code/game/machinery/machinery.dm` -> `code/game/machinery/_machinery.dm`
Moved all circuitboards to a new folder at `code/game/objects/items/weapons/circuitboards`
2017-08-09 11:10:48 -03:00
shizcalev
22764665c9 CentCom Standardization 2017-08-07 19:04:27 -04:00
pubby
866f928ec2 Fixes a cliffhanger comment. 2017-07-30 09:11:32 -05:00
ShizCalev
d525b18d8d Completes major inhand split project (#29574)
* Completes split project

* More work on it. Should be more or less finished
2017-07-29 16:47:37 -03:00
shizcalev
8ebf6b6a43 cleaned up paper 2017-07-26 05:35:05 -04:00
ShizCalev
45d3d52af7 Made some object lists less terrible to read (#29304)
* spaces

* more spaces

* last ones
2017-07-18 10:44:29 -04:00
kevinz000
0833a9002f Ports instruments from /VG/station, including harmonicas, xylophones, saxophones, trombones, and a BIKE HORN. Repaths instruments to sound/instruments. Also, allows piano synth to play all instruments but eguitar and gives cargo a crate with everything. Clown gets the bike horn trumpet at roundstart. (#29277)
* multiext

* instruments

* kekkles

* clown

* Update instruments.dm

* Update packs.dm

* Update packs.dm

* Update instruments.dm

* Update action.dm

* typo

* Update instruments.dm
2017-07-16 12:48:51 -04:00
Leo
ca59ca6c23 Changes all access const to be a define (#29260) 2017-07-16 18:44:23 +02:00
ShizCalev
db10f35703 Cleaned up some emag_acts (#29238)
* cleaned up some emag_acts

* Randomized spark sounds

* Made sparky looking things sound sparky too

* early return
2017-07-15 11:27:50 -04:00
ShizCalev
59ef81245b Changes some 1s and 0s to TRUE and FALSE (#29144) 2017-07-10 10:31:34 -04:00
Jordan Brown
3fb988c9c7 Swarmer cleanup 2017-06-28 11:05:49 -04:00
AnturK
0c3edf1ff7 Shuttle engines affecting travel time (#28564) 2017-06-25 22:52:06 -03:00
RandomMarine
bdd54531c8 Exporting mechs! (#28749)
* exporting mechs

* remove null

* do the thing the maintainer wants

* non-snowflek

* Minor thing
2017-06-25 12:34:09 -04:00
Nick
4140b5bc59 Centcom starts importing cat ears/tails (#28732)
* Update organs.dm

* Update organs.dm

* Update organs.dm

* Update organs.dm
2017-06-24 18:47:44 -04:00
nicbn
77a2d3f5cd Replaces "istype"s with is_helpers macros (#28676) 2017-06-22 15:03:19 -03:00
Jordan Brown
79cefc69d7 Merge pull request #28526 from RandomMarine/nothingmatters
Remember to test your PRs, kids! - Rebalances matter cartridge cost redux
2017-06-17 22:26:09 -04:00
Joan Lung
f07435337c Merge pull request #28435 from lzimann/typecaches
Changes a lot of is_type_in_list to use a typecache
2017-06-17 12:33:03 -04:00
RandomMarine
eac372fff8 Actually do what #22687 tried 2017-06-16 18:29:47 -07:00
Expletive
fe73e0e920 Gives the captain a somewhat robust golden fountain pen, and some others an average fountain pen. (#28382) 2017-06-16 22:12:10 -03:00
Lzimann
3b7fc1afc2 Changes a lot of is_type_in_list to use a typecache 2017-06-13 15:56:09 -03:00
TrustyGun
1db56a3d58 Clown Toy Box + Wooden Crates (#28227) 2017-06-09 13:01:51 -03:00
ShizCalev
f2d829261a [Typo] Duffel Bag (#28200) 2017-06-08 19:16:20 -03:00
Joan Lung
93bf75b576 Merge pull request #28178 from Expletive/detectivehair
Adds 91 new sprites for the Detective's Fedora and gives it some better booze.
2017-06-08 11:50:55 -04:00
Expletive
18807306a0 Fixes 28154: Accidental cargo exploit edition. (#28172) 2017-06-07 22:41:30 -03:00
Expletive
78473ac024 Resprite fedoras, Curator and Detective hats are now subtypes of fedora. All benefit from hair extensions 2017-06-07 09:03:19 -07:00
Expletive
8413960d8e A large and unasked for repath and improvement of accessories (formerly ties, but actually armbands and medals) (#28115) 2017-06-06 22:26:56 -03:00
Expletive
2b298bb6aa Adds The NT-75 Electromagnetic Power Inducer (#27653) 2017-05-31 14:59:13 -03:00
Joan Lung
ac4da32733 Splits mining_mobs.dm into separate files (#27773)
* Splits mining_mobs.dm into separate files

* find/replace
2017-05-29 02:16:26 -04:00
Lzimann
62b6e5bd27 Fixes a runtime with contraband crates 2017-05-26 23:22:15 -03:00
Pigeons
b1534b1ee8 Nerfs plasma cost 2017-05-23 14:28:17 -04:00
Leo
7d91e3143d Changes investigate logs to use a define (#27503) 2017-05-23 15:45:09 +12:00
Leo
17910dfe9c Merge pull request #27218 from Cruix/selltech
Fixed tech disk exports
2017-05-14 21:42:26 -03:00
coiax
7d84cb9ad8 Fixes engraved messages (#27186)
* Fixes engraved messages

🆑 coiax
fix: Curator soapstones now successfully leave messages for future
shifts.
del: Soapstones can no longer be purchased in cargo.
del: The janitor no longer starts with an empty soapstone.
experiment: Engraved messages can be left anywhere in the world, but be
wary that the terrain of places like lavaland and space can change shift
to shift.
/🆑

- Curators are now the sole owners of soapstones at shift start. This
means that a huge cargo point bounty shift will not overwhelm the
station with messages.
- Curators have an additional thing to curate.
- All the snowflake name bullshit is dumb, they're called soapstones,
they're plasma bluespace chisels, okay

* Fun messages for the log

* Log world

* Good to go
2017-05-14 21:50:16 +02:00
Ian Turk
fa4a54c43a Fixed not being able to sell research disks, and being able to re-sell disks by sending low-tech disks to reset the levels 2017-05-13 10:00:59 -06:00
Iamgoofball
448d3bc89e Balances Exports finally (#27099)
* Balances Exports finally

Exports have a basic sense of maximum amount, lowering by 1% in value for every sale, raising in 0.1% every 2 ticks up to it's max

* Update exports.dm

* Adds consistent marginal cost function (with decreasing marginal returns) and its associated antiderivative for total cost

* Tweaks get_cost procs and other properties in accordance with the new cost function

* Removes undefined vars causing errors

* Tweaks crates cost property

* I hate MINERAL_MATERIAL_AMOUNT AKA minor snowflake refactor

* Fixes price elasticity comments

* Changes var kelasticity to k_elasticity for better readablity

* Removes meme math obfuscation
2017-05-14 00:19:05 +12:00
ma44
9ef4e6a626 Update sheets.dm 2017-05-09 08:50:57 -05:00
QualityVan
76fc44167a Makes medbay vending machines buildable 2017-05-05 02:11:21 -04:00