Commit Graph

6419 Commits

Author SHA1 Message Date
Arokha Sieyes
93770b3be7 Changes emergency box to have goggles, mask, and O2 tank in it.
Just goggles for synths.
2017-05-27 03:10:43 -04:00
Leshana
8c8e04a0a0 Converted VOREStation custom guns and ammo to handle the swap of 5.56 and 7.62 ammo.
* Swapped our loot drops and guns to keep the damage of loot and guns the same.
* Edited the c762 magazine definition back to keep the same ammo count in each magazine type as before.

Conversion chart used:
==OLD==     max_ammo    ==NEW=      max_ammo
a556        10          s762        10
a556m       20          c762        (20)

s762        10          c556        20
c762        20          c556/ext    30
a762        50          a556        50
2017-05-26 17:54:04 -04: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
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
Arokha Sieyes
70e03f2377 Merge pull request #1553 from VOREStation/sundry-runtimes2
Sundry runtimes 2
2017-05-25 16:39:39 -04:00
Arokha Sieyes
25808b524a Reduce jammer power consumption
It's for the ERPs yo. And you can always find it by just walking around a bit and listening to the static if someone uses them for robust purposes (probably a lot more rare on our server).
2017-05-25 12:09:29 -04:00
Leshana
a4c6496720 Fixes Runtime in lattice.dm,41: undefined proc or verb /turf/simulated/floor/airless/update(). 2017-05-23 21:03:39 -04:00
Arokha Sieyes
ef43dfa816 Add some 'single' random spawns to the maps
A single netgun will always spawn somewhere on the map, but the location is random.
Either a bluespace harpoon or a translocator will spawn somewhere on the map, but never both, and location is also random.

Keep in mind they have a chance of spawning in maint where they can be easily grabbed... or spawned into one of those closed-off walled-in single rooms that are occasionally in the walls with stuff in them, so you might not see them every shift.
2017-05-22 18:12:37 -04:00
Arokha Sieyes
c910985263 Make illegal maint spawns a little more fun
Fuzzy cuffs, radio jammers, anti-photon grenades, syndie radio keys
2017-05-21 21:09:28 -04:00
Dhaeleena
b2479bb416 Fixes Stray disposals junction on S3. Fixes missing bandanas icon state. Access fixes for xenoarch in S1. Adds grilles to mining outpost, fixes one area on that area, adds recharger. Still can fix power on that are pls halp. Fixes NT lockers wrong icon state. Fixes emergency airlocks on C6 not being locked. 2017-05-21 07:20:00 -03:00
Arokha Sieyes
d3d180f739 Merge pull request #1497 from VOREStation/aro-tether-wip
Various Tether Fixes
2017-05-21 00:35:52 -04:00
Arokha Sieyes
1ae616fe01 Fix bluespace harpoon spawning 2017-05-20 22:26:07 -04:00
Arokha Sieyes
67574a8bcb Makes survival box correctly hold gas mask and one tank 2017-05-20 22:26:06 -04:00
Arokha Sieyes
3a856f5bad Merge pull request #1493 from VOREStation/aro-tether-wip
Tether Map
2017-05-20 17:19:32 -04:00
Leshana
e4becce7bf Added VOREStation comments to our custom lines that were missing them and removed debugging code. 2017-05-20 16:57:33 -04:00
Leshana
be19a40248 Fix missing closing HTML tags in messages. 2017-05-20 16:05:54 -04:00
Yoshax
3d63880041 Adds defines cause who wants problems 2017-05-20 18:11:20 +01:00
Arokha Sieyes
d6676912bd Gas mask in survival box 2017-05-20 01:36:24 -04:00
Anewbe
098e2ffff8 Merge pull request #3436 from VOREStation/aro-pol-jammer
Subspace jammer item
2017-05-18 19:12:26 -05:00
Leshana
acc1e9a0ba Revert changes to structures.dmi and re-do them using structures_vr.dmi 2017-05-17 20:47:38 -04:00
Arokha Sieyes
5d73d45461 Merge pull request #1481 from VOREStation/aro-jammer
Subspace jammer item
2017-05-17 20:47:32 -04:00
Leshana
a8dbd7627d Converts our own uses of PoolOrNew to use just new() 2017-05-16 00:26:56 -04:00
Leshana
5ae26332fa Merge branch 'master' into aro-tether-wip
# Conflicts:
#	code/ZAS/_docs.dm
#	code/game/area/areas.dm
#	code/game/objects/explosion.dm
#	code/modules/holodeck/HolodeckControl.dm
#	code/modules/mob/living/say.dm
2017-05-16 00:26:32 -04:00
Anewbe
0bfc6de678 Trashbag can hold more 2017-05-13 10:20:45 -05:00
Arokha Sieyes
60889202c4 Moves icon 2017-05-09 20:45:03 -04:00
Neerti
d900b52a33 Defib Fixes
Fixes runtime when screwdrivering the defib to remove the powercell.
Husked people can no longer be revived.  This is because otherwise they could become alive again but remain husked.
2017-05-09 20:14:04 -04:00
Arokha Sieyes
5c7ef1bbef Subspace jammer item
Jams the three devices that I'm aware of that use subspace communications: Headsets, PDAs, and Communicators.

All three will be unable to communicate if in range of a jammer. The default range is 7 turfs, the battery that comes in the jammer is a weapon cell (just to make it a little harder to find replacements) and lasts 60 seconds. The range and power use are variables.

Speaking through a headset will produce 'soft' or 'loud' static depending on how far you are, allowing you to sort of dead-reckon your way to a placed jammer. You can just carry them, otherwise.

I've got no experience with adding tator items so I'll leave that sort of thing up to you guys.
2017-05-09 20:13:43 -04:00
Arokha Sieyes
6e21e1ad28 Subspace jammer item
Jams the three devices that I'm aware of that use subspace communications: Headsets, PDAs, and Communicators.

All three will be unable to communicate if in range of a jammer. The default range is 7 turfs, the battery that comes in the jammer is a weapon cell (just to make it a little harder to find replacements) and lasts 60 seconds. The range and power use are variables.

Speaking through a headset will produce 'soft' or 'loud' static depending on how far you are, allowing you to sort of dead-reckon your way to a placed jammer. You can just carry them, otherwise.

I've got no experience with adding tator items so I'll leave that sort of thing up to you guys.
2017-05-09 20:11:23 -04:00
Neerti
ec9617a593 Merge pull request #3433 from Yoshax/fleshlights
Nerfs flashlight brightness due to them being different due to soft lighting
2017-05-09 15:32:22 -04:00
Yoshax
1c07f11def Nerfs flashlight brightness due to them being different due to soft lighting 2017-05-09 17:00:15 +01:00
Arokha Sieyes
d1b37bf481 Split HoS locker into two 2017-05-09 11:10:14 -04:00
Arokha Sieyes
7058806865 Ports 'head' guns from Eris, change Hunter sprite
RD: Bluespace Harpoon
HoS: Lamia handgun
HoP: Holdout E-Gun
A few other unused ones included in code.
2017-05-09 02:42:32 -04:00
Leshana
8fbaa446d1 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2017-05-08 2017-05-08 21:24:15 -04: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
Anewbe
cae50c2818 Merge pull request #3428 from Anewbe/explosions
Explosion sounds
2017-05-08 19:12:32 -05:00
Anewbe
42fe5d9ed6 Merge pull request #3412 from VOREStation/pool-closed
Removes the datum pool, as it is not performant.
2017-05-08 17:21:24 -05:00
Arokha Sieyes
2771747bb2 Radio Tweaks
Intercom sprite change, fix centcom headset sprite to be unique, add 'NT' headset.
2017-05-07 23:35:25 -04:00
Anewbe
bce6db1135 Fixes another thing 2017-05-07 18:15:54 -05:00
Arokha Sieyes
199e8f3656 Fix for Uplink Runtimes 2017-05-07 16:51:55 -04:00
Anewbe
51d07afdc3 Dunno how it compiled last time 2017-05-07 14:02:43 -05:00
Anewbe
12e13e7f67 Explosion sounds 2017-05-06 21:34:38 -05:00
Anewbe
3b82b75f83 Merge pull request #3396 from Cerebulon/skirtsuits
Adds 24 new skirt versions of suit sprites.
2017-05-05 21:55:14 -05:00
LorenLuke
11dc8f23a6 Explosions affect items on turf before the turf itself. 2017-05-05 11:51:53 -04:00
LorenLuke
d49ec95acd Explosions affect items on turf before the turf itself. 2017-05-05 11:42:22 -04:00
Leshana
ad8789dc8c 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 21:14:42 -04:00
Anewbe
75ae42ca81 Fixes a thing 2017-05-04 21:14:07 -04:00
Anewbe
1feba48827 Ports MultiZAS 2017-05-04 21:13:53 -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
092c2100cc Fixes a thing 2017-05-04 19:51:55 -04:00
Anewbe
cce1fcc1f5 Ports MultiZAS 2017-05-04 19:51:54 -04:00