91 Commits
Author SHA1 Message Date
TheFurryFeline f2bd35f46a LET THE PLUSHIES LIVE
Changes icon states for mouse plushies to NOT be resembling dead mice. :C
2019-10-03 01:11:41 -04:00
RazgrizandGitHub 9b7d2bdece Action figure text fix
Removed a period.
So like
The Research Director action figure says "Blowing all of the borgs!".
is now
The Research Director action figure says "Blowing all of the borgs!"
And that goes for all of them now.
2019-03-04 12:34:41 -07:00
IgnusVam 5c68e9685c Big changes DO NOT PUSH TO LIVE YET
- De-christmases the map
- Fixes the silly plush
- Adds a medical outpost, areas need textures
- Adds a medical shuttle, needs serious work, currently nonfunctional.
- Adds new stuff to the trade shuttle
- Tweaks the armory items
- Various other QOL improvements.
2019-01-17 16:50:28 -07:00
IgnusVam 4e3ea2889b Various fixes and improvements
- Fixes a few things that slipped through the cracks in the first testing, oops
- Added new sprites to deathclaws, if you see a failsnake, yell at me
- New plush
2018-12-02 18:11:11 -07:00
Schnayy b56299cc57 - Fixes carp plushies to now have a base sprite & be selectable in the loadout.
- Adjusts gift vendor to have a few of the newer plushies, as well as change them to cost thaler rather than a coin.
- Champagne is now a premium item rather than contraband.
2018-04-20 09:55:09 -05:00
Woodratt fe28a50574 Changes to objects random
- Fixed the icon_state for 'structure/plushie/carp' and the random first aid kit spawner
- Added a random chance tool spawn for power tools (most of the time it should still just be regular tools)
- Adjusted the spawn rate of medkits, combat medkits should be more rare
- Cash split into its own loot item
- Plushies split into large and small plushies
- All the extra plushie spawns added to the random plushie spawn
- Eightball and conch shell added to toy spawns
- Added spawn points for the large plushies, cash, and the power tools
2018-03-23 23:03:15 -07:00
Arokha Sieyes 1afa7a10f5 Further toy tweaks 2018-02-27 16:00:32 -05:00
Arokha Sieyes 6d165a5059 Belsima toy word changes 2018-02-27 16:00:32 -05:00
Arokha Sieyes 63fd767102 Rebased deconflicted plush additions 2018-02-27 16:00:16 -05:00
BelsimaandAnewbe a578eeeb85 plushie love (#4964)
* plushie love

* Kiss2

* good god why

* you can make severed heads kiss now :)

* [I] first

* [I] first2

* comma

* comma
2018-02-27 14:49:06 -06:00
SchnayyandAnewbe 36236e1883 Sivian Western Sprite Pack (#4970)
* Adds: flamenco dress, bustle dress, cowboy duster, sheriff badge, tiny cowboy hat. To be added: 2 pairs of cowboy boots, stick horse.

* Adds 2 cowboy boots and a stick horse. yeehaw.

* Attempting to squash conflict that was caused by one of my OWN prs. For shame.

* attempting to fix conflict ft. anewbe
2018-02-27 14:24:20 -06:00
Schnayy 02447e5c19 The largest PR I've probably actually done. Adds the following:
* Bouquets
* Fake Bouquets. Can be won from arcade machines.
* Heart box chocolates containing a set arrangement of chocolates.
* Adds said chocolates (milk chocolate, white chocolate, and truffles) all bite-sized.
* Adds 5 cards, one blank and four with covers. Function identical to paper except you can't make an airplane because I hate fun.
* Adds The four cards with covers, 3 real bouquets, and 2 chocolate boxes to cargo under a 'gift crate' for 10 points.

Sprites by me. Code would not be possible without cerebul's help. Let me know if I've goofed on something, but I did test all of the items + ordering them from cargo.
2018-02-15 03:33:23 -06:00
mistyLuminescence 0d9a175aac Adds bracelets! 2017-11-17 18:27:35 +00:00
mistyLuminescence eef59a1bbc tweaks v2 2017-10-31 20:49:17 +00:00
mistyLuminescence f67a3858cd Plushie tweaks! 2017-10-31 15:47:00 +00:00
BelsimaandAnewbe 3069df74a4 Spelling + drone (#4050) 2017-10-12 11:14:46 -05:00
Anewbe ff7c4fe45a Makes a bunch of things fit in holsters 2017-10-07 17:24:18 -05:00
Cameron653andGitHub 9b7ed4fbcc Katana was defined twice 2017-09-30 17:35:11 -04:00
Cyantime 61ff20a4da Adds a short delay between plushie messages. 2017-09-10 14:16:07 -04:00
Spades 2330968176 Replaces Station Administrator 2016-10-06 22:38:02 -04:00
Neerti 828dacf485 Centralizes weight class definitions
A lot of new defines are now in inventory_sizes.dm, which contains;
All the size identifiers (the thing that tells the game if something is bulky, or w/e).
Storage costs for all the sizes, which are exponents of two, as previously.
A few constants for inventory size.

Also changes all storage item's capacity definitions by basing it off of how many 'normal slots' exist for it.  This allows one to change the definition for all of the defines in the file, and everything will follow along without needing to change 500 files.  In testing, I made all ITEMSIZE_COST_* defines doubled, and nothing had broke.

The benefit of doing all of this is that it makes adding new weight classes in the future much simpler, and makes knowing how much space a container has easier, as seeing ITEMSIZE_COST_NORMAL * 7 means it can hold seven normal items.
2016-09-22 00:51:51 -04:00
SinTwo a2a2f58e93 Fixes #2352 2016-08-27 13:44:32 -04:00
SinTwo 7192bf08fd item_state cleanup 2016-07-11 22:31:32 -04:00
Kelenius 3fdda5e8c5 Fixes issues travis found 2016-03-11 11:59:51 +03:00
Neerti 451c477e4c Tweaks event text to fit with the lore better.
Adds more informative text for vending machines.
Removes RNG viruses.
2015-12-21 04:01:05 -05:00
woodratt 13adf4f235 1.3.1 Christmas and tweaks.
- Intercoms added to the chapel, recreation area, pool.
- Maint door added to the starboard maint.
- Removed the second sleeper from the merc shuttle.
- Replaced the central tree at central with a Christmas tree.
- Added a small Christmas tree, Christmas lights, Tiny Christmas tree, and holiday wreaths to map. (Sprites from Aurora)
- Christmas decorations added everywhere.
- Garden statue tucked into maint, replaced with a big Christmas tree.
- Drink Machine added to security
- Fixed the pathing on therapy dolls.
- Removed farwa plushie from psych office, replaced with blue therapy doll.
2015-12-12 21:14:23 -08:00
Neerti 78e5701b5c Replaces most instances of Nyx to Vir. 2015-11-26 01:01:06 -05:00
PsiOmegaDelta 7bcf9aaea9 Merge pull request #10340 from comma/russian_roulette
Russian roulette and russian roulette accessories
2015-09-03 19:40:01 +02:00
Zuhayr 3bfa541612 Adds variables for CentComm, NanoTrasen and the station name. 2015-08-22 02:10:11 +09:30
mwerezak 2cb46e035c Removes unused obj flags and fixes overlapping flags
Removes ONESIZEFITSALL and NOSHIELD, which were unused.
2015-08-18 17:08:41 -04:00
Chinsky 328621b860 Moved cap guns to proper guns. 2015-08-14 05:51:29 +03:00
PsiOmegaDelta 9b4d09c974 Merge remote-tracking branch 'upstream/dev-freeze' into dev
Conflicts:
	code/_helpers/unsorted.dm
	code/game/objects/items/weapons/RCD.dm
	code/game/objects/items/weapons/grenades/emgrenade.dm
	code/modules/clothing/spacesuits/rig/rig_attackby.dm
2015-07-11 10:58:49 +02:00
PsiOmegaDelta 265802d270 Merge remote-tracking branch 'upstream/master' into dev-freeze
Conflicts:
	code/controllers/_DynamicAreaLighting_TG.dm
	code/game/objects/effects/chem/chemsmoke.dm
	code/game/objects/explosion.dm
2015-07-10 12:57:46 +02:00
mwerezak 6fb6237816 Fixes #9984
Fixes capgun and dart crossbow inhands.
2015-07-09 23:00:22 -04:00
Zuhayr 48cf00ca54 Merge with dev-freeze. 2015-06-21 20:45:47 +09:30
mwerezak f8d5127078 Adds SLOT_EARS to various items 2015-06-21 01:45:43 -04:00
PsiOmegaDelta 1558bd5b75 Merge remote-tracking branch 'upstream/dev-freeze' into dev
Conflicts:
	code/game/objects/items/toys.dm
	code/modules/mob/living/carbon/brain/life.dm
	code/modules/mob/living/carbon/human/life.dm
	code/modules/mob/living/living_defense.dm
	code/modules/reagents/Chemistry-Holder.dm
	code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Toxins.dm
	code/modules/reagents/reagent_containers.dm
	html/changelogs/.all_changelog.yml
2015-06-19 10:19:08 +02:00
PsiOmega 0a05c2659f All the span-corrected dm files. 2015-06-14 22:08:14 +02:00
mwerezak 8007d42783 Adjusts usages of reagent transfer procs
Adds splash() proc for futureproofing.
Replaces instances of splash_mob() with splash()
Replaces instances of trans_to() with splash() where appropriate.
2015-06-10 00:03:08 -04:00
GinjaNinja32 c77605265c code/game/objects, code/game/machinery merge fix 2015-06-02 20:18:45 +01:00
PsiOmega 5ee1e3df56 Fixes #9443.
Restores an old sunflower sprite for use by toys.
2015-05-23 19:38:31 +02:00
Kelenius 10915eae24 Merge branch 'dev' into ofChemistryAndStuff
Conflicts:
	code/game/objects/effects/chem/chemsmoke.dm
	code/modules/customitems/item_defines.dm
	code/modules/projectiles/guns/launcher/syringe_gun.dm
	code/modules/reagents/Chemistry-Holder.dm
	code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Toxins.dm
	code/modules/reagents/reagent_containers/food/drinks.dm
	code/modules/reagents/reagent_containers/pill.dm
	maps/exodus-1.dmm
2015-05-15 11:28:05 +03:00
Zuhayr 4e85c5f387 Dev merge. 2015-05-12 23:33:29 +09:30
Zuhayr 495952ff5d Changed steel material name to a define. 2015-05-12 13:08:41 +09:30
Zuhayr 4cf296a6c9 First pass on custom item cleanup/refactor. 2015-05-12 10:53:16 +09:30
Zuhayr bc50ba5166 Merge resolution. 2015-05-11 11:47:24 +09:30
PsiOmega 1c38be5cfd Crayons are now children of pens. 2015-05-05 08:41:24 +02:00
Kelenius 317abc6b79 Merge branch 'dev' into ofChemistryAndStuff
Conflicts:
	code/datums/recipe.dm
	code/game/machinery/bots/farmbot.dm
	code/game/machinery/bots/medbot.dm
	code/game/mecha/equipment/tools/tools.dm
	code/game/objects/effects/chem/chemsmoke.dm
	code/game/objects/effects/effect_system.dm
	code/game/objects/items/toys.dm
	code/game/objects/items/weapons/extinguisher.dm
	code/game/objects/items/weapons/mop.dm
	code/modules/mob/living/carbon/human/human.dm
	code/modules/organs/organ_internal.dm
	code/modules/reagents/Chemistry-Holder.dm
	code/modules/reagents/Chemistry-Reagents.dm
	code/modules/reagents/Chemistry-Recipes.dm
	code/modules/reagents/reagent_containers/food/snacks.dm
	code/modules/reagents/reagent_containers/pill.dm
	code/modules/reagents/reagent_containers/spray.dm
	maps/exodus-1.dmm
2015-04-28 10:49:26 +03:00
Zuhayr dbf8e53020 Mass rename of 'metal' to steel, refactor of walls and falsewall mineral construction, refactor of materials and ores. 2015-04-26 12:53:26 +09:30
PsiOmega 1fea589ad7 Merge remote-tracking branch 'upstream/dev' into TheSummoning
Conflicts:
	code/game/machinery/cryopod.dm
	code/game/objects/items/weapons/clown_items.dm
2015-04-24 17:13:37 +02:00