Commit Graph

1048 Commits

Author SHA1 Message Date
Leshana
5f5ea3ea3b Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-merge-2017-05-26
# Conflicts:
#	code/game/gamemodes/technomancer/spells/insert/mend_burns.dm
#	code/game/gamemodes/technomancer/spells/insert/mend_metal.dm
#	code/game/gamemodes/technomancer/spells/insert/mend_organs.dm
#	code/game/gamemodes/technomancer/spells/insert/mend_wires.dm
#	code/game/machinery/computer/Operating.dm
#	code/game/machinery/computer/camera.dm
#	code/game/machinery/computer/communications.dm
#	code/game/machinery/computer/security.dm
#	code/game/machinery/computer/skills.dm
#	code/game/objects/items/devices/radio/jammer.dm
#	html/changelogs/.all_changelog.yml
#	maps/~map_system/maps.dm
#	nano/images/nanomap_z1.png
#	nano/images/nanomap_z5.png
2017-05-26 15:29:46 -04:00
Arokha Sieyes
05f9401254 Several Tether Fixes + Medical Rearrange
- Rearranges medical to some extent
- Added a pill vendor near each surface airlock with antitox and painkiller pills (remember to remove contaminated clothes (including boots, which may not show the symbol) before taking the pills otherwise it's kinda pointless). You should only need one pill.
- Fix solitary confinement cryopod computer location
- Added missing fire alarms in asteroid
- Add missing firelock to library door
- Made it so you can reach over med records laptops
- Dhae: Rebalanced maintenance spawns
2017-05-23 16:50:55 -04:00
Leshana
d41f6cce04 Ensure computers work on centcom or when only one zlevel is accessible. 2017-05-22 16:18:26 -04:00
Leshana
b4ca6b11e1 Switch nanomap computers over to using get_sensor_levels()
* Added a proc to the map datum which returns what zlevels a nanomap capable computer should display.
* Updated the atmos control, power monitoring, crew monitoring, and camera consoles to use it.
* Changed templates to not show the map button if no map levels are available.
2017-05-22 16:18:26 -04:00
Arokha Sieyes
f79a23ea48 Fix computers above z6 2017-05-22 16:15:47 -04:00
Leshana
fbb1a75438 Enabled multi-z nanomap in nanoui on power monitor, sec camera, and armos computers. 2017-05-22 16:15:47 -04:00
Leshana
93495bd53e Switch nanomap computers over to using get_sensor_levels()
* Added a proc to the map datum which returns what zlevels a nanomap capable computer should display.
* Updated the atmos control, power monitoring, crew monitoring, and camera consoles to use it.
* Changed templates to not show the map button if no map levels are available.
* Overrode it for tether to let crew monitoring computers monitor the whole station.
2017-05-21 22:03:18 -04:00
Arokha Sieyes
b46a3c0c16 Fix computers above z6 2017-05-21 00:59:23 -04:00
Arokha Sieyes
71feaa4f8f Communications computer fix
Stupid code. Why would you do that.
Reference using_map instead of hard coding z levels.
2017-05-17 20:42:55 -04:00
Leshana
dfecfe34e6 Stop turning op table!
* Operating table and computer liked to literally spin around during initialization due to someone using `dir` as a loop counter without declaring it as a local variable.
2017-05-17 20:16:36 -04:00
Leshana
8d1ea8c138 Enabled multi-z nanomap in nanoui on power monitor, sec camera, and armos computers. 2017-05-17 00:58:21 -04:00
Leshana
8fa8901919 Fix icon of power monitor
Squash this with other power monitor commit.
2017-05-11 12:59:16 -04:00
Leshana
99f55ce746 Stop turning operating computer! 2017-05-09 21:32:27 -04:00
Arokha Sieyes
d22d21285d Stop turning, operating computer 2017-05-08 19:06:47 -04:00
Arokha Sieyes
68c64eb9e1 Squash with earlier communication computer fix 2017-05-08 13:19:33 -04:00
Arokha Sieyes
b38dc607e6 Communications computer fix
Stupid code. Why would you do that.
2017-05-08 03:22:20 -04:00
Arokha Sieyes
80670b420c Merge current master in 2017-04-25 20:14:38 -04:00
Atermonera
3f1194696a Brain type is shown on all records 2017-04-22 18:18:31 -07:00
Arokha Sieyes
647350eedb Eris Computer Icon Tweaks 2017-04-19 23:53:53 -04:00
Arokha Sieyes
0fe43a1f2b 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:54:16 -04:00
Arokha Sieyes
47ff29c04b Move to Eris Computers 2017-04-19 16:51:10 -04:00
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
Anewbe
2c9c3e208e Merge branch 'master' of https://github.com/PolarisSS13/Polaris into heart_damage_2
# Conflicts:
#	code/modules/mob/living/simple_animal/hostile/giant_spider.dm
#	code/modules/organs/blood.dm
#	code/modules/organs/internal/lungs.dm
#	code/modules/organs/organ.dm
#	code/modules/organs/organ_external.dm
2017-03-22 17:29:01 -05:00
Neerti
d4b6fc9f32 Merge pull request #3052 from Anewbe/emp_things
Reworks empulse and emp_act
2017-03-14 21:39:01 -04:00
Neerti
9dbd05e8d4 Ports Vore's Space Traffic Controller feature.
Ports Vore's fluff spaceships that talk on comms every ~40 minutes.
2017-03-08 22:06:48 -05:00
Anewbe
19710d9bd8 Reworks empulse and emp_act 2017-03-05 12:22:45 -06: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
Leshana
4b5615ad69 Fixes Issue #2982 - Deconstruction of Fax Machine
* Fax machine's New() was not calling `..()` and therefore `circuit` was not being changed from a type to an instance.  Thus when deconstruct proc tries to read it's properties it can't.
* A search thru code found the aifixer had the same problem. Fixed it there too.
2017-02-04 17:34:03 -05:00
Anewbe
ccfbd7c9ac Mining outpost camera console should work now 2017-01-29 15:25:53 -06:00
Anewbe
83db0cc38f Medical tweaks 2017-01-23 23:43:44 -06:00
Neerti
4f81ae340b Map change + entertainment monitor tweak
Adds TV drone to librarian's office.
Entertainment monitors now broadcast the entertainment frequency when powered.
2017-01-09 08:34:16 -05:00
Anewbe
006197dbc6 Merge pull request #2603 from Yoshax/minorbugfixboogalo
Some bugfixes
2016-10-06 22:38:32 -05:00
Yoshax
34da81b5e2 Fixes #2311 2016-10-07 04:07:59 +01: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
MementoVile
c5297e65ce Use sanitizeName for the guest pass terminal name input to prevent excessively long names. 2016-09-19 15:04:00 +01:00
Spades
9c78d6a2a1 Naming inconsistencies fixed
The short naming of central command has been really inconsistent across
the game's files. This has always annoyed the shit out of me.

CentComm and Centcomm and Centcom are now all CentCom, specifically with
that capitalization. Why one M instead of two M's? Because Comm with two
'M's = Communications. Hence, Telecomms, NOT Telecoms. Telecoms is
incorrect. CentCom was also chosen because CentCom with one M and this
casing is most found throughout the game's files.

Speaking of Telecomms, I corrected one instance in the game where it's
Telecom. Like I said, this is not correct. There was only one
inconsistency.

Likewise, Nanotrasen has been changed to NanoTrasen. Nanotrasen only
appears 20 times, where NanoTrasen appears 62. NanoTrasen is clearly the
preferred, correct naming.
2016-09-13 16:36:43 -04:00
Yoshax
f7c459d796 Merge pull request #2357 from SinTwo/framecleanup2
Frame Cleanup + Machinery Code Cleanup
2016-08-28 18:31:16 +01:00
SinTwo
a2a2f58e93 Fixes #2352 2016-08-27 13:44:32 -04:00
SinTwo
fa92cdeeda Merge branch 'master' of https://github.com/PolarisSS13/Polaris into framecleanup2 2016-08-23 18:33:51 -04:00
SinTwo
8a5e045921 Fixes #2302 2016-08-15 10:33:53 -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
b42d46205f more time proc call fixes 2016-07-30 17:39:47 -04:00
SinTwo
4f7ea573c1 world time fix 2016-07-30 03:19:47 -04:00
Yoshax
93b7e661c4 Ensures contraband for supply computers can be properly acquired via hacking 2016-07-23 20:24:04 +01:00
SinTwo
eb120319eb Frame code cleanup 2016-07-23 13:31:30 -04:00
Yoshax
f5b1d73ba2 Ensures cargo consoles can be properly emagged 2016-07-12 20:01:50 +01:00
Anewbe
38ed1e6431 Removes the Robot Console's ability to blow up borgs 2016-07-10 02:18:24 -05:00