Commit Graph

2263 Commits

Author SHA1 Message Date
Leshana
69a50ec225 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-20170609
# Conflicts:
#	code/_macros.dm
#	code/controllers/master_controller.dm
#	vorestation.dme
2017-06-09 22:54:16 -04:00
Leshana
746571f53f Adds bedsheets to the list of washable items.
Fixes https://github.com/VOREStation/VOREStation/issues/1456
2017-06-05 14:21:07 -04:00
Leshana
197a648795 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2017-06-01
# Conflicts:
#	code/game/objects/structures/crates_lockers/closets/secure/security.dm
#	code/modules/multiz/movement.dm
#	code/modules/projectiles/ammunition/magazines.dm
2017-06-01 17:27:00 -04:00
Unknown
81c2d1ab40 Added some shading to the trash pile sprites.
It was bothering me.
2017-05-31 20:23:17 -07:00
Anewbe
0af77012c4 Merge pull request #3465 from Yoshax/radiation
Ports radiation rework and stuff from Bay
2017-05-31 18:37:58 -05:00
Arokha Sieyes
2a58bb4d69 Merge pull request #1569 from chaoko99/mapmergepy
Adds mapmergePY
2017-05-30 22:21:37 -04:00
Leshana
2c8df87899 Tweak to Radiation Optimization
* Optimized garbage collection of radiation sources until we get qdel() hints.
* Made the RADIATION_LOWER_LIMIT configurable (option for people to save some cpu time)
* Added some comments and broke the proccessor into separate procs for profiling purposes
* Added a changelog.
2017-05-30 13:55:53 -04:00
Anewbe
214255df6b Merge pull request #3471 from MagmaRam/space_health_care_act
Reduces autoheal cutoff on all external wounds to 10.
2017-05-27 10:30:02 -05:00
Unknown
50c3e40a22 Adds mapmergePY
More or less because I CBA to install java right now.
2017-05-26 20:05:38 -07:00
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
Neerti
aad701fee7 Merge pull request #3463 from VOREStation/multiz-consoles
Multiz consoles
2017-05-26 12:06:49 -04:00
Leshana
dfbba572cf Prevent falling from sudden gravity restoration if buckled.
* Also stops the floating animation while you're buckled, so you know.
* Resolves https://github.com/VOREStation/VOREStation/issues/1458
2017-05-25 18:07:32 -04:00
MagmaRam
e3bc79b12c Changelog 2017-05-24 16:44:57 -05:00
Leshana
4adbb14de3 Generated the z1 and z5 nanomap for northern_star station. 2017-05-22 16:18:26 -04:00
Anewbe
5744812469 Merge pull request #3458 from VOREStation/vplk-mapz
EZ Map Datum Setup
2017-05-22 14:14:27 -05:00
Ben Reeve
6185bbd212 Unified radiation system 2017-05-22 16:24:34 +01:00
Anewbe
929f556f07 Adds a changelog for #3405 2017-05-21 13:23:08 -05:00
Leshana
ecd19ee1af Adds an admin verb to debug the current map datum.
Useful for making sure it loaded right.
2017-05-21 14:16:39 -04:00
Sarmie
5d7162d0a4 Refix changelog 2017-05-11 20:00:05 -04:00
Sarmie
06d5d0b189 Go 2017-05-11 19:56:20 -04:00
MagmaRam
724f455218 Changelog update 2017-05-09 18:15:32 -05:00
Anewbe
801d91ba8b Merge pull request #3421 from Neerti/5/5/2017_technomancer_changes
More Technomancer
2017-05-09 17:54:53 -05:00
Yoshax
1c07f11def Nerfs flashlight brightness due to them being different due to soft lighting 2017-05-09 17:00:15 +01:00
Leshana
4fbfa7ee37 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2017-05-08
# Conflicts:
#	code/modules/mob/dead/observer/observer.dm
#	code/modules/mob/living/carbon/human/life.dm
#	code/modules/mob/mob_defines.dm
#	html/changelogs/.all_changelog.yml
#	vorestation.dme
2017-05-08 21:07:45 -04:00
Yoshax
26ef7c2217 Bunch of hair changelog 2017-05-06 19:39:08 +01:00
SiegDerMaus
e64f0bb97b Adds Chin Length Bob
A new haircut for those who like bobs, but always hated how short the
one already in game is.
2017-05-06 19:26:22 +01:00
Anewbe
96d2de352d Merge pull request #3413 from VOREStation/vplk-opitmize-multi-zas
Optmized Multi-Z ZAS and explosions ports
2017-05-05 21:05:07 -05:00
Neerti
a35ab6c69b changelog 2017-05-05 21:49:18 -04:00
MagmaRam
2d0070a665 changelog update 2017-05-05 20:26:29 -05:00
Datraen
97e7e10bc2 Fixes mutate() in xenobio2 to produce a unique traits datum
Recently brought to me, so I'm fixing it.
2017-05-05 12:23:00 -04:00
Leshana
347e759b10 Make the multi-z explosion strength scalar configurable.
* Its much easier to test out and decide what explosion scalar is nice if you can configure it.
* As an added bonus, by setting it to zero this lets you disable multi-z explosions altogether without turning off all of multi-z.
2017-05-04 20:27:15 -04:00
Anewbe
cce1fcc1f5 Ports MultiZAS 2017-05-04 19:51:54 -04:00
Anewbe
b71a67a775 Merge pull request #3410 from VOREStation/fix-area-firedoors
Area alarms should not fight each other for control of fire doors.
2017-05-04 15:50:03 -05:00
Leshana
e2a1d67b2c Area alarms should not fight each other for control of fire doors.
* Instead of each individually controlling fire doors, setting or clearing alerts now simply calls firedoors_update() which considers both fire and atmos statuses before deciding to close or open the doors.
* Preserved existing "party" alert status for posterity.
* Removed obsolete setting of mouse_opacity, it is always zero on areas.
* Fixes https://github.com/VOREStation/VOREStation/issues/1464
2017-05-03 20:45:02 -04:00
Anewbe
100ab0528f Merge branch 'master' of https://github.com/PolarisSS13/Polaris into dice_thing 2017-05-02 11:13:53 -05:00
Neerti
ccb5e5700b Merge pull request #3387 from VOREStation/aro-pol-zzz
Stasis Bag and Sleeper Changes
2017-05-02 12:09:33 -04:00
Anewbe
ed472a36d2 Merge pull request #3402 from LorenLuke/Communicator-Video
Can view active video calls that you camera'd out of.
2017-04-30 16:55:17 -05:00
LorenLuke
ee5e011c6c Can view active video calls that you camera'd out of. 2017-04-30 14:39:08 -07:00
Anewbe
60b42d2aba Merge pull request #3335 from LorenLuke/Sting-Range
Reworks ranged changeling stings
2017-04-30 09:17:33 -05:00
Yoshax
612e7f3b64 Syncs some missed changes from Polaris (#1445)
* Adds in some missed changes from Polaris

* Fixes the changelog by taking it straight from Polaris
2017-04-29 19:31:02 -04:00
Arokha Sieyes
ce8b2b66ee Changelog for Stasis 2017-04-29 18:59:38 -04:00
Anewbe
aaee637d30 Merge pull request #3377 from LorenLuke/PointBlankAim
Aim mode point blank targets on harm.
2017-04-29 10:42:22 -05:00
Anewbe
5ff71f926c Merge pull request #3362 from LorenLuke/Changeling-Visual
Fixes roundstart changeling visual bug
2017-04-28 14:50:51 -05:00
Neerti
2745885609 Merge pull request #3267 from Anewbe/thermals
Thermals can see in the dark
2017-04-27 13:03:55 -04:00
Anewbe
6f914ca160 Merge pull request #3365 from LorenLuke/Changeling-Medhud
Revived changelings now are alive on medhuds.
2017-04-26 15:52:58 -05:00
LorenLuke
fb4a24fd38 Aim mode point blank targets on harm. 2017-04-26 11:26:31 -07:00
Anewbe
77bd526404 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into thermals 2017-04-26 11:25:34 -05:00
Neerti
d89a3a4498 Merge pull request #3366 from LorenLuke/Self-Handcuffs
Can now apply handcuffs to oneself.
2017-04-25 23:43:06 -04:00
MagmaRam
8b6b1e1016 changelog update 2017-04-25 22:19:45 -05:00
Anewbe
eda374cf83 Merge pull request #3356 from Neerti/4/23/2017_ling_nerfs
Adjusts Changelings
2017-04-25 22:04:37 -05:00