Commit Graph

26726 Commits

Author SHA1 Message Date
Yoshax
b188fae46b Fixes an issue where a non-existent language was existing + some normalisation 2017-05-20 17:52:24 +01:00
Arokha Sieyes
5d73d45461 Merge pull request #1481 from VOREStation/aro-jammer
Subspace jammer item
2017-05-17 20:47:32 -04:00
Arokha Sieyes
f445a9c725 Merge pull request #1473 from Cameron653/master
Serdy desc changes, serdy gun whitelist.
2017-05-17 20:45:14 -04:00
killer653
8100fd3635 Adds SilencedMP5A5's permit 2017-05-14 16:35:04 -04:00
Screemonster
691aa28eba Adds a whole bunch of markings 2017-05-14 05:31:10 +01:00
killer653
fe767f44b5 Literally right after I submitted the PR 2017-05-11 15:36:09 -04:00
killer653
a535948e90 Serdy desc changes, serdy gun whitelist. 2017-05-11 15:30:52 -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
Leshana
8b0cf0617b Fix VOREStation use of color macros so we pass the new stringent macro tests. 2017-05-08 22:34:13 -04:00
Leshana
88f0e65cf9 Converts our own uses of PoolOrNew to use just new() 2017-05-08 21:24:47 -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
Anewbe
bce6db1135 Fixes another thing 2017-05-07 18:15:54 -05:00
Anewbe
51d07afdc3 Dunno how it compiled last time 2017-05-07 14:02:43 -05:00
Neerti
1f737cb826 Merge pull request #3427 from Anewbe/straight_jacket
Fixes a straightjacket bug
2017-05-07 14:12:26 -04:00
Anewbe
e93e87b998 Merge pull request #3429 from LorenLuke/Holidays
Adds two holidays
2017-05-07 13:09:18 -05:00
Anewbe
32271f7ae6 Merge pull request #3425 from Yoshax/hair
Ports a bunch of hair from Bay
2017-05-07 11:34:46 -05:00
LorenLuke
de4de97e69 #3384, but works. 2017-05-07 09:20:10 -07:00
Anewbe
12e13e7f67 Explosion sounds 2017-05-06 21:34:38 -05:00
Anewbe
5bed51da31 Fixes a straightjacket bug 2017-05-06 15:40:38 -05:00
Neerti
1d5afefea9 Fixes Logic Circuits
They should now function properly.
2017-05-06 16:35:06 -04:00
Yoshax
c808a6fb66 Removes Unathi from chin bob 2017-05-06 20:27:28 +01:00
Yoshax
6635857cf1 Ports a bunch of hair or something 2017-05-06 19:37:55 +01:00
sabiram
6cfc825f53 Adds and fixes some hairstyles 2017-05-06 19:30:59 +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
3b82b75f83 Merge pull request #3396 from Cerebulon/skirtsuits
Adds 24 new skirt versions of suit sprites.
2017-05-05 21:55:14 -05: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
MagmaRam
2a456e9026 Merge pull request #3419 from Anewbe/iaa_lock
Adds a 7 day timelock to the IAA job
2017-05-05 20:29:17 -05:00
Anewbe
99929b33e1 Adds a 7 day timelock to the IAA job 2017-05-05 20:22:14 -05:00
Anewbe
2c42583d1b Merge pull request #3416 from Bromuzl/Undershirt-corrections
Undershirt corrections
2017-05-05 20:15:42 -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
LorenLuke
d49ec95acd Explosions affect items on turf before the turf itself. 2017-05-05 11:42:22 -04:00
Bromuzl
ef678994f7 Adding missing shirts to Undershirt, minor cleanup
Two of the button-down shirts were not referenced in the undershirt datum, removed one previously accidentally added twice.
2017-05-05 05:05:56 -05:00
Anewbe
83382e5f9d Fixes a thing 2017-05-04 20:53:59 -05: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
Leshana
fdb5d80afa Multi-ZAS Optimization
A simple optimization to can_safely_remove_from_zone() both with and without multi-zas.
Instead of allocating a new list every time we call get_zone_neighbours() (which gets called several times in a loop) we have a pre-built list we don't need to Copy().
Same story for the list to iterate over in can_safely_remove_from_zone()
There should be no semantic change whatsoever from this; it is purely a performance optimization.
2017-05-04 19:51:55 -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
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
44ff1a70c6 Removes the datum pool, as it is not performant.
* Creating new objects is cheap, in fact comparable to the cost of getting it out of the pool, so it doesn't help there.
* Placing items in the pool is far more expensive than letting them garbage collect due to the resetting of vars and such.
2017-05-04 01:58:33 -04:00
Yoshax
40be042005 Add's Tempest's custom implant item (#1461)
* Implant stuff

Does more implant stuff

Does even more implant stuff

EVEN MOAR IMPLANT STUFF

Adds Tempest's custom fluff implant along with the generalized parent type

* Changes implant to just use its own reagents holder rather than a beaker, thanks Leshana

* Last commit maybe? Yay?
2017-05-03 22:09:07 -04:00
Arokha Sieyes
c4fd243694 Merge pull request #1460 from VOREStation/aro-adranol
Adds Adranol
2017-05-03 22:08:47 -04:00
Arokha Sieyes
1343d82725 Merge pull request #1459 from VOREStation/aro-moreglasses
Adds more AR glasses to vendors
2017-05-03 22:08:35 -04:00
Arokha Sieyes
a3bf1b2492 Merge pull request #1457 from Yoshax/permitguns
Adds Aerowing and Table's custom item/gun stuff
2017-05-03 22:08:26 -04:00
JoanRisu
88e5fe0ead Resolves #1188 and #794 (#1427)
* resolves  #1188 and #794

* Moves custom taur armor stuff to the fluff items file. Adds comments to items for organizational purposes.

* Fixes

* Additional fixins

* Thanks Travis
2017-05-03 22:07:38 -04:00
Anewbe
b12a46ffb7 Merge pull request #3409 from Yoshax/missfix
Simple fix for #3374
2017-05-03 20:45:36 -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
Yoshax
eda674eca0 Attack fix 2017-05-04 01:21:47 +01:00