Commit Graph

25356 Commits

Author SHA1 Message Date
Anewbe
098e2ffff8 Merge pull request #3436 from VOREStation/aro-pol-jammer
Subspace jammer item
2017-05-18 19:12:26 -05:00
Anewbe
eab2a410ba Merge pull request #3453 from Eimras/Diona-shock-fix
Diona don't get shocked working on electrical things
2017-05-17 17:42:01 -05:00
Sarmie
84a7f64010 Re-branch to fix GIT stuff 2017-05-17 17:17:45 -04:00
Neerti
e0725d738b Merge pull request #3451 from VOREStation/vplk-loremaster-runtime
Fix runtime in air_traffic.dm due to bad organizations in loremaster.
2017-05-17 00:51:47 -04:00
Leshana
75e9f619fa Fix runtime in air_traffic.dm due to bad organizations in loremaster.
* Loremaster was loading all subtypes of /datum/lore/organization, but some intermediate subtypes are never meant to be used (such as /datum/lore/organization/mil)
* These intermediate subtypes have no names, and no ship_prefixes, so crash the ATC.
* Fix by not loading ones not meant to be loaded.  Detected by checking if they have a non-null name.
2017-05-15 23:14:34 -04:00
Leshana
ea223cd5fc Prevent lighting_overlay objects from being moved around.
* lighting_overlay objects belong to a turf. Turfs never move. Neither should the lighting_overlay, even of an overzealous shuttle controller thinks they should.
2017-05-15 17:16:40 -04:00
Anewbe
0bfc6de678 Trashbag can hold more 2017-05-13 10:20:45 -05:00
Anewbe
4caa7088d6 Merge pull request #3441 from Eimras/diona-regen-fix
Diona regen fix
2017-05-12 19:51:19 -05:00
Sarmie
3ca8bc1375 Disfigure Check Fix 2017-05-12 20:42:36 -04:00
Anewbe
84df53fcf7 Merge pull request #3431 from Cerebulon/suitcleanup
Cleans up uniform loadout menu.
2017-05-12 16:25:39 -05:00
Sarmie
78880cd18e Disfigure check 2017-05-11 20:24:21 -04:00
Sarmie
06d5d0b189 Go 2017-05-11 19:56:20 -04:00
Leshana
df9e76efd6 Small ZAS Optimization
Minor optimization; eliminates a few proc calls when managing zone
connections by turning check() into a macro.
2017-05-10 20:12:13 -04:00
Cerebulon
2c327a42fc Fixes inexplicable capital letters in Lawyer and Suit sometimes. 2017-05-10 03:43:03 +01: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
Neerti
0ef887794b Merge pull request #3424 from Anewbe/meson_vision
Supermatter Hallucination Tweak
2017-05-09 19:11:31 -04:00
Neerti
5381e55187 Makes code compile.
Wew.
2017-05-09 19:04:09 -04:00
Anewbe
801d91ba8b Merge pull request #3421 from Neerti/5/5/2017_technomancer_changes
More Technomancer
2017-05-09 17:54:53 -05:00
Neerti
48b7ef38fd Merge pull request #3422 from Anewbe/engineering_timelock
Adds a 3-day timelock to the Engineering job
2017-05-09 18:50:12 -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
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
Cerebulon
0ce6ca7290 Cleans up uniform loadout menu.
Suits are now mostly under one-piece (subtypes of 'lawyer') and modular (subtypes of 'suit_jacket') selection menus. Croptops also under selection menu.
2017-05-08 00:31:31 +01: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
0f68a9b156 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into meson_vision 2017-05-06 08:22:02 -05:00
Anewbe
771413617e Adds a 3-day timelock to the Engineering job 2017-05-06 08:18:58 -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
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
Neerti
b76b2c34a7 More Technomancer
See PR
2017-05-05 19:02:48 -04: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