Commit Graph

90 Commits

Author SHA1 Message Date
Spades
3ff9d441f9 Finishes fixing ammo inconsistencies 2017-05-27 04:39:49 -04:00
Anewbe
2de037fbbf Ports a bunch of fluff stuff 2017-02-21 13:50:14 -06:00
Anewbe
f1d37c241d Light boxes should be able to hold 24 bulbs/tubes now 2017-01-19 16:05:31 -06:00
Anewbe
2c86a0a465 Returns the Vox, who now breath Phoron 2017-01-06 17:49:39 -06:00
Anewbe
2352001cfb Adds teargas grenades, currently aspawn only 2016-11-10 22:53:59 -06:00
Anewbe
0d0322b93c Adjusts shotgun ammo box contents 2016-10-03 21:48:16 -05:00
Anewbe
e65b0851f3 Adds emp shotgun shells, not yet obtainable. 2016-09-25 23:52:30 -05: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
Anewbe
0cb1f8c27a Cleans up the code to match recent Tajaran rewrite 2016-08-13 23:07:00 -05:00
Anewbe
89e98a39fb Merge pull request #2181 from Yoshax/uplinkcosttweaks
Uplink cost tweaks
2016-07-24 17:13:03 -05:00
SinTwo
8e9676aa26 storage item item_state fix 2016-07-24 00:19:45 -04:00
Yoshax
305255d2ee Adjusts uplink item costs 2016-07-23 21:00:53 +01:00
SinTwo
976847a0b4 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into item_state
Conflicts:
	code/modules/clothing/head/jobs.dm
	icons/mob/items/lefthand.dmi
	icons/mob/items/righthand.dmi
	icons/mob/suit.dmi
	icons/mob/uniform.dmi
	icons/obj/items.dmi
2016-07-13 17:07:52 -04:00
SinTwo
7192bf08fd item_state cleanup 2016-07-11 22:31:32 -04:00
Neerti
e9dd848cf1 Freezer Fixes
Freezer crates, freezer boxes, cryobags, and medical grippers now properly preserve organs, as well as organs attached to organs.
Cleans up storage.dm slightly by removing loc setting with forceMove(), for the above to work.
2016-07-10 03:00:25 -04:00
GinjaNinja32
debfd3dabf Ports GinjaNinja32's drinks rewrite from Bay 2016-06-06 20:33:11 +01:00
Datraen
fbb0f764d2 Adds a missing (src) 2016-06-02 18:12:21 -04:00
Yoshax
0777379d37 Fixes box of EMP grenades only ever spawning 1 grenade 2016-06-01 02:00:57 +01:00
Yoshax
718b249b1d Uplink changes and additions (#1645)
* Splits uplink categories into separate files and moves other files around

* Corrects an incorrect description

* Puts uplink categories in uplink_categories into the same order as they are individual files

* Mercenaries now spawn with their own private uplink.

* Adds a random discount to uplink items that is applied every 15 minutes

no message

no message

* Adds changelog

* Fakes announcements are now once again purchasable from the uplink and actually work

* Removes a debug line

* Adds several existing items to the antag uplink including stun rounds for shotguns, metal foam grenades and more

* Refactors boxes.dm to use absolute pathing and for loops for contents

Adds changelog
2016-05-15 18:31:34 -04:00
Yoshax
47508187cc Makes smoke grenades last longer and adjusts checks
- Changes boxes of smokes from 5 to 7 grenades
- Changes mapped in single smoke grenades to boxes
2016-05-06 17:25:28 +01:00
Neerti
25c04df5bd Polaris tweaks.
Fixes mistake involving belts.
Fixes mistake involving bags allowing w_class 5 items, which was from the manual merge.
Polaris tweaks

Makes inflatables w_class 3.
Spacesuits and RIGs are now w_class 5.
Both sniper weapons are now w_class 5.
Makes more inventories able to use the volume based system.
Cleans up the cig part of the port a bit.
2016-04-06 07:48:09 -04:00
Neerti
469c01daf9 Manually ports Bay's volume inventory system. 2016-04-06 03:31:21 -04:00
Zuhayr
a628ae2a56 Removed the Vox Pox. 2016-02-20 11:24:19 +10:30
Mark9013100
cab884b5dc Implements sprites for shotgun shell boxes. 2016-02-12 20:30:43 -05:00
Mark9013100
63db2c8f0b Portable Freezers can no longer be folded 2016-02-10 05:43:09 -05:00
woodratt
a22195aed3 1.3.0 of Grenades and Elevators
- Explosive grenades have gotten a major upgrade, (borrowed code from fragmentation grenades).
- Box for explosive grenades lowered to 5 grenades per box instead of 7.
- Evidence locker moved to forensics area from detective's office. Body bags, latex gloves, and evidence bags moved to said locker.
- Low yield EMP grenades created including sprites. Box for them created (neither added to the map).
- Can now spawn from the elevator.
2015-12-11 23:05:15 -08:00
Mark9013100
880ba681e6 Combination of my previous PRs, mostly fixes 2015-11-29 11:13:17 -05:00
Neerti
4f77afece1 Revert 58ef59734f 2015-11-08 10:09:14 -05:00
Neerti
45f15930a0 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into 11/6/2015_neerti_breaks_everything_bay_merge
Conflicts:
	.travis.yml
	code/_helpers/lists.dm
	code/game/objects/structures/crates_lockers/closets/secure/engineering.dm
	code/global.dm
	code/modules/client/preferences.dm
	code/modules/client/preferences_savefile.dm
	code/modules/reagents/dispenser/dispenser2.dm
	polaris.dme
2015-11-06 17:41:18 -05:00
PsiOmegaDelta
299ad9580c Merge remote-tracking branch 'upstream/dev-freeze' into dev
Conflicts:
	code/modules/admin/admin.dm
	code/modules/admin/topic.dm
2015-10-16 13:02:59 +02:00
PsiOmegaDelta
fc4c1d6af7 Merge remote-tracking branch 'upstream/master' into dev-freeze
Conflicts:
	code/game/objects/items/weapons/storage/boxes.dm
	code/game/objects/items/weapons/storage/storage.dm
2015-10-16 11:04:43 +02:00
PsiOmegaDelta
e79e82f55d Gives replacement light boxes the same fitness treatment. 2015-10-15 10:42:51 +02:00
Mark9013100
1273a51f83 Merges f-card box and evidence bag box
Conflicts:
	code/game/objects/items/weapons/storage/boxes.dm
2015-10-11 00:41:46 -04:00
Neerti
e52a0ea332 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into sync_to_bay_10/10/2015
Conflicts:
	.travis.yml
	code/game/gamemodes/changeling/changeling_powers.dm
	code/game/gamemodes/changeling/modularchangling.dm
	code/game/turfs/simulated.dm
	code/global.dm
	icons/misc/fullscreen.dmi
	polaris.dme
2015-10-10 23:17:26 -04:00
PsiOmega
de2e9e2d9a Odd typo fixes. 2015-09-21 20:31:47 +02:00
Neerti
00fa623c9d Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into dev
Conflicts:
	.travis.yml
	code/controllers/configuration.dm
	code/game/gamemodes/changeling/modularchangling.dm
	code/game/jobs/job/medical.dm
	code/game/jobs/job/security.dm
	code/game/machinery/Sleeper.dm
	code/game/machinery/computer/communications.dm
	code/game/machinery/cryopod.dm
	code/game/objects/items/weapons/RCD.dm
	code/game/objects/items/weapons/storage/boxes.dm
	code/game/turfs/simulated/floor.dm
	code/game/turfs/simulated/floor_types.dm
	code/global.dm
	code/modules/materials/materials.dm
	code/modules/mob/living/silicon/ai/ai.dm
	code/modules/projectiles/guns/projectile/automatic.dm
	polaris.dme
2015-08-23 01:30:46 -04:00
PsiOmegaDelta
0380d5d9d4 Completes the feature where mercenaries can setup fake crew announcements and records. 2015-08-14 13:42:11 +02:00
Woodrat
df92e8d1d1 Woodrat Work 7.9 - Minty Fresh Edition
- EMP box sprite added and now used for the EMP box.
- Adjusted lights in Janitorial
- 5 Earmuffs added to Engineering. 3 to atmos, 2 in the engine monitoring room.
- Dock Port broken wire fixed and pipes removed.
- Misplaced CMD camera near the park deleted.
- Fixed EVA maint door access.
- Due to popular request, laser tag lockers now have 5 sets of equipment rather than two.
- Fixed some holodeck designs
- Slimes added to xenobio
- Random gas sensors in space near the research outpost fixed.
- CE door access fixed.
- Changed Northern Star issue tag to mint green.
- Mining z-level overhaul, mining engineering outpost given its own area. Standardized wire colors, overhauled engineering outpost on the mining z-level, added substations to each outpost.
- Empty jar added to the RD office
- Beepsky removed until I can figure out how he beeps.
- AI and status displays added to the pool.
- Random shovel now in science/cargo maintenance.
- Fire alarms and other equipment added to the coffee shop.
- Fire alarm, radio, fire extinguisher, light switches, shutters, and a button added to the IA office.
- Furniture changes to the metal chair and comfy chair.
2015-08-12 21:47:49 -07:00
Mark9013100
65089c44b7 Adds a box for fingerprint cards 2015-08-09 11:36:57 -04:00
Woodrat
b8c0c5ca5d Woodrat Work 7.8 "Tiny mini skirt edition"
- Added jumpskirts to their department lockers.
- Fixed minor code issue with the QM skirt
- Single scientist wardrobe added to research rest room
- Removed robust cola machine from gateway, added laptop vendor in its stead.
- Two universal recorders added to the main map. Captain's office and art storage.
- Adjusted and added cameras to the doc area to improve coverage.
- Adjusted cameras in primary hallway leading to the dock for coverage purposes.
- Added newscaster to central park.
- Finalized work on the large dorms/visitor housing.
- Added CM sprite for frag grenades for our grenades, also lessened the size of the explosion to (-1,-1,3) from (-1, -1, 4) in a vain attempt to make the blast radius smaller. They shouldn't be too much weaker but...
- Sprite for a box of frag grenades added, box of 7 frag grenades also added to code.
- Two merc op TTVs removed, one left behind. One box of frags and 6 blocks of c4 added to merc op shuttle in their stead.
- One box of frag grenades added to ERT armory.
2015-08-08 23:18:39 -07:00
PsiOmega
385a21772d Adds anti-photon grenades. 2015-07-28 09:25:38 +02:00
PsiOmegaDelta
00953968dd Merge remote-tracking branch 'upstream/dev-freeze' into dev 2015-06-04 08:20:00 +02:00
Zuhayr
9d9efc336b Merge pull request #9649 from mwerezak/fixes
Fixes
2015-06-03 11:45:45 +09:30
mwerezak
45d60ab551 Fixes #9640 2015-06-02 22:00:34 -04:00
PsiOmega
3d49ad3927 Merge remote-tracking branch 'upstream/dev-freeze' into dev
Conflicts:
	code/game/jobs/job/job.dm
	code/game/jobs/job/silicon.dm
	code/game/objects/items/weapons/surgery_tools.dm
	code/modules/materials/materials.dm
	code/modules/mob/living/carbon/human/species/species.dm
	code/modules/mob/living/carbon/human/species/station/station.dm
	code/modules/organs/organ_external.dm
	icons/obj/objects.dmi
2015-06-01 09:07:03 +02:00
Techhead0
9047bbe2a2 Removes O2 tank and spare mask from Vox boxes. 2015-05-31 14:17:24 -04:00
Zuhayr
3cae318716 Merge pull request #9370 from comma/frankenstein
Frankenstein
2015-05-25 13:56:40 +09:30
Chinsky
a7d6cf3545 tyops fiexs 2015-05-20 09:49:10 +03:00
Chinsky
05975d78b1 Adds a portable organs/lunch freezer 2015-05-19 09:33:26 +03:00
Zuhayr
358867f3b5 Major sheet and material refactor. 2015-05-17 01:46:53 +09:30