Commit Graph

226 Commits

Author SHA1 Message Date
Neerti
411bd2b05b Ports Turbolifts from Bay. 2017-03-04 21:35:00 -05:00
Arokha Sieyes
387f429e5e Merge large polaris changes 2017-03-02 22:44:17 -05:00
Neerti
836d8dfa3f More stuff, finalizes it I hope. 2017-02-20 18:28:31 -05:00
Dhaeleena
3cdf56f4c3 Flesh Turfs 2017-01-24 23:48:50 -03:00
MagmaRam
190a2bc70c Replaces [stack]/fifty atoms with atoms that spawn the normal stack
The stack/fifty objects were really buggy, this should fix all of that in one go.
2016-12-17 17:27:04 -06:00
Yoshax
102c0c2277 Makes clipboards producible out of wood 2016-11-12 01:26:20 +00: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
Hubblenaut
044a677ab0 Construction Tweaks and Fixes (#2253)
* Fixes reinforced Walls construction

when having one sheet left in the stack

* Amends Windoors

 - Assemblies are now made with two sheets of either normal or reinforced
   glass sheets, for normal and secure windoors respecting.
 - Assemblies can now be named with a pen, just like airlocks.
 - Windoor assemblies now get placed like windows, and windows take
   windoor assemblies into account when placed.
 - Decapitalises windoor assembly names.
 - Shattering windoors will make them drop exactly what they were made of
   now.
 - Prying emagged windoors will no longer make them shatter on top of
   returning to an assembly.
 - Cleans up a lot of code and gets its own update_icon() proc.

* Amends airlocks

 - Fixes airlocks occasionally not updating their icon correctly.
 - Fixes airlocks causing sparks on spawn as if they were damaged.
 - Fixes airlock not being anchored after being turned into an assembly.
 - Decapitalises airlock names.

* Windows that get unanchored by force will now correctly have the rotate verb.

* Adds changelog entry
2016-08-02 18:39:22 +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
Yoshax
c60407e6f4 Adds fifty stacks for all material stacks and makes drop pod actually drop fifties 2016-07-10 03:40:24 +01:00
Yoshax
cf09435293 Adds material stack variants with base 50 amount for adminspawn etc 2016-07-09 04:04:40 +01:00
EmperorJon
5b3c952be9 Merge pull request #2039 from SinTwo/smallfeatures
Water-Coolers, Floor Lamps, and Benches
2016-07-08 09:54:11 +01:00
Neerti
bcca19bc71 AI Core Update
Changes layout of the AI core, see picture in PR.
Moves APCs for core and upload to the backs of the rooms.
Critical APCs can somewhat resist EMP now.
Gives turrets a ten second timeout until they go underneath the turret covers, unless turned off manually or if they lose power.
Adds a new type of turret specifically for the AI upload/core.  This type has more health, has a 1/3 chance to ignore EMP, and fires xray lasers, to counter ablative armor.
A new material called Durasteel has been added.  It is made from Plasteel and diamonds, and boasts more toughness than Plasteel alone, as well as reflectivity.  The inner walls of the AI core are made out of this new material, which makes emitters less helpful.
Emitters can be damaged by projectiles, and will explode if too much damage is sustained.  Shooting a Durasteel wall will likely cause you to lose the emitter.
New AI core turrets turn green when on lethal, to show that xray is coming.
2016-07-05 17:33:34 -04:00
SinTwo
a7aa2a7f33 makes benches a subtype of tables 2016-06-29 17:52:27 -04:00
SinTwo
8ecc72412d minor fixes and icon adjustment 2016-06-19 23:30:46 -04:00
Broseph Stylin
4518e22be2 Small update to double beds. (#1828)
* Corrects a typo because I'm dumb.

* Adds double bed recipe to appropriate materials.
2016-05-31 15:08:57 +01:00
Hubblenaut
e41ad0c946 Reinforced Walls
Lowers amount needed for building a reinforced wall from a girder from
four to two sheets.
Gets rid of rod products from dismantling a reinforced wall.
Adds one more extra step for undoing the deconstruction.
2016-04-15 16:41:33 +02:00
Neerti
96e52f5af0 Merge pull request #1229 from SinTwo/construction_update
Construction update
2016-03-26 15:45:19 -04:00
Neerti
57b6fe7aa8 Merge pull request #1169 from Kelenius/fixesOnly
Axes old wire, fixes costs in lathe
2016-03-26 15:42:25 -04:00
SinTwo
b356f5cf21 Construction Update 2016-03-25 16:02:36 -04:00
Kelenius
e883863f4b Merge branch 'master' into playingWithTravis 2016-03-23 17:12:11 +03:00
Kelenius
afbc235b96 Mob inventory cleanup 2016-03-15 16:39:40 +03:00
Kelenius
359889a15c Axes old wire, fixes costs in lathe 2016-03-12 11:38:52 +03:00
Kelenius
3fdda5e8c5 Fixes issues travis found 2016-03-11 11:59:51 +03:00
Zuhayr
cbc506fd51 Removed xenomorphs. 2016-02-20 11:50:18 +10:30
Zuhayr
a628ae2a56 Removed the Vox Pox. 2016-02-20 11:24:19 +10:30
Zuhayr
7c3993b68b Revert "Revert "Bay update."" 2016-02-07 16:33:30 +10:30
Zuhayr
98d983577c Revert "Bay update." 2016-02-07 16:07:05 +10:30
Zuhayr
d5b904ca2a Merge branch 'master' of https://github.com/PolarisSS13/Polaris 2016-01-26 11:11:55 +10:30
Zuhayr
e557a71fdc Merge branch 'dev-freeze' of https://github.com/Baystation12/Baystation12 2016-01-20 08:01:14 +10:30
Kelenius
ee531578d7 Fixes #94
Protolathe and CI will now correctly eject materials.
2016-01-18 15:06:33 +03:00
Zuhayr
5313c6b67b Added Nerf weapons to Cargo. Codersprites. 2015-12-24 22:05:10 +10:30
Zuhayr
f93ea6a78f Tweaks to previous commits.
More tweaks to IPC fixes.
Merge resolution/compile fixes.

Further work on properly integrating, updating and fixing prosthetic options.

Repathed internal organs to organ/internal.

More work on full synthetics, changelings, overheating.

Working on getting organs to qdel properly and spawn properly when robotized.

Finalized some overheating values, added remaining prosthetic icons.

Finalizing the testing version of the full prosthetic bodies branch.

Added suit cyclers to the autolathe and map.

Fixing runtime errors.

Fixing errors.

Changelog.

Replacing limb and organ strings with constants.

Prevented brainless species from becoming full cyborgs.

Fixed issues with brain/MMIs renaming themselves inappropriately.

Various fixes and oversights.
2015-12-24 21:13:40 +10:30
sabess
a9a0573237 Removed brass knuckles from steel sheets, added to hacked autolathe. 2015-12-18 13:16:09 +11:00
sabess
1bf719f20f Fixed brass knuckles; only possible to get them from steel now. 2015-12-14 16:38:05 +11:00
sabess
966048c0ad Adds brass knuckles. 2015-12-14 15:57:48 +11:00
PsiOmegaDelta
f382626075 Merge remote-tracking branch 'upstream/master' into dev-freeze
Conflicts:
	code/game/asteroid.dm
	code/game/verbs/ooc.dm
	code/modules/admin/verbs/icarus.dm
	code/modules/mob/living/silicon/robot/robot_items.dm
	code/modules/projectiles/projectile/special.dm
	code/modules/random_map/random_map.dm
	code/setup.dm
2015-12-13 10:15:29 +01:00
Zuhayr
d5447d9e95 Fixes #10838 2015-12-10 10:23:49 +10:30
Hubblenaut
470d2bb54a Fixes stack creation logic and return value 2015-12-04 15:49:31 +01: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
3fd28dd361 Merge remote-tracking branch 'upstream/dev-freeze' into dev
Conflicts:
	html/changelogs/.all_changelog.yml
2015-10-14 08:41:38 +02:00
PsiOmegaDelta
3fd172ee63 Merge pull request #11294 from Baystation12/master
Dev-freeze
2015-10-14 08:40:03 +02:00
Hubblenaut
1c8ec1a700 Fixes stack creation logic and return value 2015-10-11 22:02:05 +02:00
Neerti
a9dda6cf3f Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into 9/6/2015_baymerge
Conflicts:
	.travis.yml
	code/game/gamemodes/cult/cult.dm
	code/game/gamemodes/heist/heist.dm
	code/game/gamemodes/ninja/ninja.dm
	code/game/gamemodes/nuclear/nuclear.dm
	code/game/gamemodes/traitor/traitor.dm
	code/game/gamemodes/wizard/wizard.dm
	code/game/jobs/job/civilian.dm
	code/game/jobs/job/medical.dm
	code/game/jobs/job/security.dm
	code/game/objects/structures/lattice.dm
	code/global.dm
	code/modules/projectiles/ammunition/boxes.dm
	code/modules/reagents/Chemistry-Recipes.dm
	config/example/config.txt
	polaris.dme
2015-09-06 18:26:06 -04:00
Atlantis
e0a70d24ba Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into phoronwindowsv2 2015-09-01 03:22:08 +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
Woodrat
c192378bab Woodrat Work v8.2
- Placed missing metal and glass from R&D back into R&D.
- Fixed a broken scrubber pipe on the research outpost catwalk.
- Mining and Research Outpost power issues should not be as major right off the bat. In theory should at least last half the round? Further testing needed.
- Discovery about research and mining elevators made. Filled in more asteroid turf around both, added lights to both.
- Wrong tile used in port security maintenance fixed.
- Second camera added to the AI core cause Koco is a dum dum.
- New door sprites and new door. Mixture between atmos and engieering doors, dual access. Placed on the monitoring room behind the front desk.
- Fixed Filter to phoron on the mining engineering outpost.
- Mining engineering outpost fully camera'd
- Lattice added to underneath heat exchange pipes and around the engine heat exchange pipes.
- Complete and total overhaul of the mining outpost.
- Re-removed the RCD from the industrial hardsuit.
- Blue flags created.
- One blue flag and one red flag added to the laser tag lockers.
2015-08-22 12:33:27 -07:00
Zuhayr
b702c81060 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into randmap
Conflicts:
	code/game/turfs/simulated/floor_types.dm
2015-08-22 03:57:12 +09:30