Commit Graph

609 Commits

Author SHA1 Message Date
Arokha Sieyes
49b31344f5 Removes all the hard references to computer.dmi
I assume these were all lazy copy-pasting. We're changing computer icons to another set in a file we'll keep separate, and these completely pointless references are annoying. They should inherit this from the `/computer/` level, which they do. Has no effect on Polaris, but cleans up code that shouldn't exist.
2017-04-19 16:51:03 -04:00
Arokha Sieyes
805b473976 Polaris Sync Merge
Fixed Polaris merge conflicts
* Space controller merge conflict
2017-03-18 00:58:12 -04:00
Leshana
f53dfde515 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into sync-2017-03-06
# Conflicts:
#	code/game/objects/items/blueprints.dm
#	vorestation.dme
2017-03-06 20:58:38 -05:00
Anewbe
19710d9bd8 Reworks empulse and emp_act 2017-03-05 12:22:45 -06:00
Neerti
0f781e36a7 Adds Multi-Z Test Map 2017-03-03 09:40:34 -05:00
Arokha Sieyes
387f429e5e Merge large polaris changes 2017-03-02 22:44:17 -05:00
Neerti
12abb2d6f2 Ports a large chunk of the map datum system that europa/bay uses.
Links many map-specific details such as the station name, z-level information, and allowed jobs from global vars to map datum vars, which should help us maintain multiple maps at once in the future, which will be needed for the future Southern Cross.
Note that a config change will be needed to change GENERATE_ASTEROID to GENERATE_MAP, otherwise no changes should be required to continue normal map usage.
To change to a different map, it's suggested to tick the file that ticks all the other needed files, which for the Northern Star is called northern_star.dm.
2017-02-27 07:36:41 -05:00
Arokha Sieyes
e4557b0724 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into sync 2017-02-14 20:29:57 -05:00
Arokha Sieyes
f041b2a8e6 Rename mecha power cell
Sort of annoyng to have it named the same as an actual power cell, with a different max charge. If it's going to have a unique charge amount, it should have a unique name. High-cap cells are 10k, super are 20k, so this is some weird between-cell with 15k.
2017-02-07 09:37:02 -05:00
Screemonster
1d57e78c1f fixes copypasta'd comments 2017-02-07 01:42:35 +00:00
Screemonster
2a9a4f657b Adds the gopher and equipment, better icon for weasel 2017-02-06 06:49:33 +00:00
Screemonster
931af36a2b Adds micro-only light mech/vehicle framework, plus equipment. 2017-02-05 09:04:37 +00:00
Anewbe
cad668a72a Further tweaks to Vox and their toys 2017-02-01 21:43:21 -06:00
ForFoxSake
a5d5c8e4e0 Fixes Runtime in Prosthetics Fabricator 2016-12-09 13:13:25 +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
SinTwo
045c393683 Revert "Revert "Frame Cleanup""
This reverts commit 82722ba42f.
2016-08-13 19:55:57 -04:00
Yoshax
82722ba42f Revert "Frame Cleanup" 2016-08-06 00:27:03 +01:00
Yoshax
afa7878abb Merge pull request #2263 from SinTwo/frame_cleanup
Frame Cleanup
2016-08-05 21:14:35 +01:00
SinTwo
07b4eb2d95 final fixes, tweaks, and cleanups 2016-08-03 14:09:12 -04:00
Neerti
400a437690 Oddy Sleeper Change
The sleeper for the Odysseus mech now takes five seconds instead of two to load someone inside.
2016-07-25 04:10:42 -04:00
SinTwo
66c3a007a9 frame cleanup fixes 2016-07-23 23:45:24 -04:00
PsiOmegaDelta
60593ce024 Bay-tweaks.
Ultra dynamic MedHUD states.
2016-07-10 03:14:22 +01:00
Arokha Sieyes
34d81de406 Use correct sprite for Pros fab
'chu gotta change these too.
2016-06-10 15:19:31 -04:00
Datraen
fa74226e99 Merge pull request #1844 from SpadesNeil/GunsGunsGuns
Guns, Guns, Guns (Now in a PR less stupid)
2016-06-05 13:25:26 -04:00
Yoshax
ac3a1bd691 Robotics slight adjustments 2016-06-04 15:08:01 +01:00
Spades
ff87150c3d Let's just have the one commit this time because I'm no longer paranoid of losing progress. 2016-06-01 12:48:48 -04:00
Arokha Sieyes
f23035c9ed Make Exosuit Fabs Great Again
S'what I get for copypasting suggestions I guess.
2016-05-31 18:45:08 -04:00
Arokha Sieyes
76e4afa6d7 Fix suggested by Ginja 2016-05-31 15:38:24 -04:00
Arokha Sieyes
4c86fabb63 Tags. 2016-05-30 05:32:11 -04:00
Arokha Sieyes
1b9b3ba124 Update Exosuit fab and new machine to use materials system 2016-05-30 05:29:37 -04:00
Arokha Sieyes
05f8a69821 Make FBPs Constructable
Print 'em out, slap an MMI or Posibrain in. They come from a new machine, the Prosthetics Fabricator. You can order license discs from cargo to print the proprietary limbs. Making FBPs requires a bit of research as well, otherwise you only get arms/legs. Also requires a bit of plasteel to make the critical parts. Mostly just need every limb, plus eyes. Torso comes with the snowflakey FBP battery.

Also adds an FBP 'self-diagnostics' verb. More vague than an analyzer.

**This adds a machine that needs to be placed on the map. "/obj/machinery/pros_fabricator"**

Personally, I would replace the right-side exosuit fab with it. I can add this to my PR but I'm unsure how you guys feel about non-devs submitting map changes.
2016-05-30 02:13:55 -04:00
Leshana
ca6e75ab8f Fixes runtime error when Exosuit Fabricators are deconstructed.
* You need to have the circuit be an actual instance, not a path.
2016-05-25 21:35:14 -04:00
Yoshax
6ff7293585 Removes unused Xeno stuff 2016-05-24 23:48:52 +01:00
Datraen
beda3185eb Reverts the second mob clean up because of incomplete implementation.
This caused an error that would then cause machinery to hang on the server, and was reproduced successfully.
2016-05-04 00:24:55 -04:00
Kelenius
98badae45f Merge branch 'master' into cleanupTwo 2016-04-21 11:41:32 +03:00
SinTwo
b356f5cf21 Construction Update 2016-03-25 16:02:36 -04:00
Kelenius
df5a0d7941 Mob inventory cleanup
Replaces three item removal procs with one
Adds a proc to delete an item on the mob
2016-03-24 01:23:08 +03:00
Kelenius
1d26fcfa8e Moves a few vars where they should be
This should reduce the memory usage
2016-03-15 11:26:46 +03:00
Datraen
55a024ef14 Adds a mech flare launcher, can be mounted on any mech. 2016-02-24 21:15:48 -05:00
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
Neerti
f2cd67fe16 Merge pull request #810 from Zuhayr/bayupdate
Bay update.
2016-02-05 23:21:07 -05:00
Datraen
4c0bd923c3 Merge pull request #866 from Kelenius/viroRemoval
Removes the old virus system
2016-02-05 21:06:09 -05:00
Zuhayr
f31438bd77 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into bayupdate 2016-01-30 08:49:35 +10:30
Datraen
1b9a8b7843 Updates mech gun code to current projectile code. 2016-01-28 11:57:59 -05:00
Kelenius
b86c730695 Removes the old virus system
Appendicitis moved to appendix organ
2016-01-27 11:44:41 +03:00
Zuhayr
e557a71fdc Merge branch 'dev-freeze' of https://github.com/Baystation12/Baystation12 2016-01-20 08:01:14 +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
Zuhayr
f2cc74d588 # This is a combination of 2 commits.
# The first commit's message is:

Rewriting the mining turfs to reduce worldstart lag.

# This is the 2nd commit message:

Map cleanup.
2015-12-16 15:26:38 +10:30
PsiOmegaDelta
5fcf13ac55 Merge remote-tracking branch 'upstream/master' into dev-freeze
Conflicts:
	code/game/objects/items/weapons/surgery_limbattachment.dm
	code/modules/mob/living/carbon/human/human_defense.dm
	code/modules/mob/living/carbon/human/species/species.dm
	code/modules/organs/organ.dm
	code/modules/organs/organ_external.dm
	code/setup.dm
2015-12-08 08:09:37 +01:00