Commit Graph

1059 Commits

Author SHA1 Message Date
EmperorJon
5b3c952be9 Merge pull request #2039 from SinTwo/smallfeatures
Water-Coolers, Floor Lamps, and Benches
2016-07-08 09:54:11 +01:00
Yoshax
1c8224fd07 Merge pull request #2028 from Anewbe/gauntlets
Hardsuit gauntlets cover gloves
2016-07-07 01:33:16 +01:00
Neerti
16426833cd Merge branch 'master' of https://github.com/PolarisSS13/Polaris into 7/5/2016_ai_core_defense 2016-07-05 17:39:26 -04:00
Neerti
bcca19bc71 AI Core Update
Changes layout of the AI core, see picture in PR.
Moves APCs for core and upload to the backs of the rooms.
Critical APCs can somewhat resist EMP now.
Gives turrets a ten second timeout until they go underneath the turret covers, unless turned off manually or if they lose power.
Adds a new type of turret specifically for the AI upload/core.  This type has more health, has a 1/3 chance to ignore EMP, and fires xray lasers, to counter ablative armor.
A new material called Durasteel has been added.  It is made from Plasteel and diamonds, and boasts more toughness than Plasteel alone, as well as reflectivity.  The inner walls of the AI core are made out of this new material, which makes emitters less helpful.
Emitters can be damaged by projectiles, and will explode if too much damage is sustained.  Shooting a Durasteel wall will likely cause you to lose the emitter.
New AI core turrets turn green when on lethal, to show that xray is coming.
2016-07-05 17:33:34 -04:00
Yoshax
99062cef3b Merge pull request #2042 from Neerti/7/5/2016_planetary_atmos
Planetary Walls
2016-07-05 13:48:06 +01:00
Neerti
dcf3f33450 Planetary Walls
Adds a new type of wall, which makes atmospherics pretend there is actually something beyond the wall that has gas to merge with.
I added some presets for normal air, as well as all of the terrestrial planets of the Vir system.
2016-07-05 07:10:16 -04:00
Anewbe
ab9bfb3817 Adds gauntlets, allows RIGs to be worn over gloves 2016-07-02 20:18:19 -05:00
SinTwo
a7aa2a7f33 makes benches a subtype of tables 2016-06-29 17:52:27 -04:00
Zuhayr
764c78b25f Ported and rewrote several cooking machines from Apollo by request.
# Conflicts:
#	maps/exodus/exodus-1.dmm
2016-06-29 13:59:24 -04:00
Neerti
20a3bd5b26 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into 12/16/2015_newwizard 2016-06-26 20:14:29 -04:00
SinTwo
fbfa773f56 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into NanoGrade
Conflicts:
	nano/css/icons.css
	nano/css/shared.css
2016-06-25 19:58:21 -04:00
Yoshax
3ab725f980 Updates our own snow to have fancy footprints + stuff 2016-06-24 14:48:27 +01:00
SinTwo
4fa126b7e7 a whole lot of nanoui upgrades 2016-06-24 00:43:16 -04:00
Neerti
53d60eb554 Does even more work.
NOTE: asphyxiation is broken!
2016-06-23 05:21:04 -04:00
SinTwo
da38eca686 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into featureattack 2016-06-19 22:28:31 -04:00
SinTwo
86e500d25c Adds floor lamp, benches, new tank sprites, and cup dispenser on water coolers. 2016-06-19 22:28:01 -04:00
Richard D'angelo
7ab5220f64 510 Improved Overlays
Fixes auto blindness and no click on 510 servers, lessens the lag of
mesons and material scanners, and I suspect the general speed as well.

I only made it work for Polaris (and by extention, to our server, Eros),
and adapted it a bit.

Ported from:

7c2cc890ab
2016-06-18 15:50:10 -03:00
Yoshax
9e79e35964 Makes science group not security 2016-06-13 22:55:30 +01:00
Yoshax
0cbade2d98 Adjusts cargo categories 2016-06-11 20:18:53 +01:00
Datraen
6984008bca Splits supplypacks.dm into categorized files, adds subtyping. 2016-06-11 12:13:40 -04:00
Datraen
299059a5be Merge pull request #1883 from Yoshax/drinks
Ports GinjaNinja32's drinks rewrite from Bay
2016-06-10 23:08:41 -04:00
Datraen
5c97cede59 Brings vending machine datums under a subtype of smartfridge datums. 2016-06-10 01:41:59 -04:00
GinjaNinja32
72e32eeed9 Fixes, change underlay icons to fit with glass icon style 2016-06-07 17:41:25 +01:00
GinjaNinja32
debfd3dabf Ports GinjaNinja32's drinks rewrite from Bay 2016-06-06 20:33:11 +01:00
Spades
736c8c132c Merge remote-tracking branch 'refs/remotes/PolarisSS13/master' into GunsGunsGuns 2016-06-02 13:01:45 -04:00
Yoshax
f75d509e7f Ports event system from Bay 2016-06-01 22:05:04 +01:00
Spades
a54e49fa73 Merge remote-tracking branch 'refs/remotes/PolarisSS13/master' into GunsGunsGuns 2016-06-01 15:16:53 -04:00
Spades
c57979849d Forgot one file. Silly me. 2016-06-01 13:19:17 -04:00
Yoshax
0fb98bbabd Scheduler now uses btime, and other improvements 2016-06-01 17:56:07 +01:00
Datraen
36d9cee0f7 Merge pull request #1806 from VOREStation/limbprinter
Make FBPs Constructable
2016-05-31 15:50:32 -04:00
Datraen
c1c3110496 Xenobio2 Update
Adds the trait scanner, which I had thought was previously added.
Fixes the smartfridge not believing that it had the cores in it's inventory.
Fixes an inverted check.
2016-05-30 23:44:53 -04:00
EmperorJon
741706e9e3 Underwear + setup merges (#1812)
* Manually merges 12595 and 12461.

* Moron Jon 2: Moron Boogaloo

* Makes Yosh happier
2016-05-30 19:19:45 +01:00
Arokha Sieyes
05f8a69821 Make FBPs Constructable
Print 'em out, slap an MMI or Posibrain in. They come from a new machine, the Prosthetics Fabricator. You can order license discs from cargo to print the proprietary limbs. Making FBPs requires a bit of research as well, otherwise you only get arms/legs. Also requires a bit of plasteel to make the critical parts. Mostly just need every limb, plus eyes. Torso comes with the snowflakey FBP battery.

Also adds an FBP 'self-diagnostics' verb. More vague than an analyzer.

**This adds a machine that needs to be placed on the map. "/obj/machinery/pros_fabricator"**

Personally, I would replace the right-side exosuit fab with it. I can add this to my PR but I'm unsure how you guys feel about non-devs submitting map changes.
2016-05-30 02:13:55 -04:00
EmperorJon
5a545854a4 Underwear Datums (#1794)
* One more step to bringing our preferences/setup stuff in line with Bay.

* Whoopsy

* Jon is a moron, more at 11.
2016-05-29 17:29:36 +01:00
Yoshax
df0135ac2b Merge branch 'master' of https://github.com/PolarisSS13/Polaris into attackcall 2016-05-29 01:00:50 +01:00
EmperorJon
01b3182004 Merge pull request #1462 from Datraen/Xenobiology_2
Xenobio2
2016-05-28 21:32:18 +01:00
Yoshax
cd9fdd228b Merge branch 'master' of https://github.com/PolarisSS13/Polaris into attackcall 2016-05-28 20:22:09 +01:00
comma
b157ebfbac Breaks up some suits into parts
-Detective suit with vest (vest, tie)
-Charcoal suit (jacket,tie)
-Burgundy suit (jacket,tie)
-Navy suit (jacket,tie)
-Tan suit (jacket,tie)
2016-05-27 23:33:54 +01:00
Zuhayr
6281516826 Generalizes the accessory system to work for suits. 2016-05-27 23:01:47 +01:00
Datraen
4448a6f469 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into Slime_Rework_3
# Conflicts:
#	code/modules/mob/living/say.dm
2016-05-26 08:20:41 -04:00
Leshana
e37ac4da3e Fixes #145 - Makes jukeboxes constructable.
* Adds circuit board.
* Adds design to print board on autolathe.
* Makes jukeboxes deconstructable back to frame.
2016-05-25 21:35:24 -04:00
Datraen
f0edb66f9b Merge pull request #1741 from VOREStation/sayupgrade
Say/Whisper Rewrite
2016-05-25 21:17:36 -04:00
Arokha Sieyes
4588498486 Worked Whisper into Say
It was annoying. And hard. But it's done.

For the most part anyway.
2016-05-25 16:59:47 -04:00
Datraen
349251e55f Merge branch 'master' of https://github.com/PolarisSS13/Polaris into Slime_Rework_3
# Conflicts:
#	icons/mob/items/lefthand.dmi
#	icons/mob/items/righthand.dmi
#	icons/obj/weapons.dmi
2016-05-25 15:09:23 -04:00
Yoshax
9b8aefed5b Adds towels 2016-05-25 18:38:16 +01:00
Datraen
79e22d58e5 Semi-final stage of Xenobio2 Initial Implementation
Adds UIs to Core Extractor, Slime Replicator
Adds Slimified Monkey Cubes as separate item type
Adds Docility Toxin
Replaces amutationtoxin references with docilitytoxin references
Adds resistances to simple_mob damage handling, to allow for simple mobs to have resistances to different kinds of damage
Moves a return to it's proper position to allow for hostile mobs to properly handle targets.
2016-05-25 03:50:23 -04:00
Datraen
bb7713b2a8 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into Slime_Rework_3
# Conflicts:
#	code/game/objects/items/devices/multitool.dm
2016-05-19 17:31:25 -04:00
Datraen
ce6b574d67 Status as of 05-18-2016 2016-05-19 15:16:48 -04:00
Yoshax
718b249b1d Uplink changes and additions (#1645)
* Splits uplink categories into separate files and moves other files around

* Corrects an incorrect description

* Puts uplink categories in uplink_categories into the same order as they are individual files

* Mercenaries now spawn with their own private uplink.

* Adds a random discount to uplink items that is applied every 15 minutes

no message

no message

* Adds changelog

* Fakes announcements are now once again purchasable from the uplink and actually work

* Removes a debug line

* Adds several existing items to the antag uplink including stun rounds for shotguns, metal foam grenades and more

* Refactors boxes.dm to use absolute pathing and for loops for contents

Adds changelog
2016-05-15 18:31:34 -04:00
Hubblenaut
f09df76e4a Hacktool (#1607)
* Adds hacking tool.

In normal mode a hacking tool acts and functions just like any multitool. Use a screwdriver to toggle between normal and hacking mode.
Hacking attempts will take 20 +(0 to 20) seconds (triangular distribution, averages at +10 seconds).
Once an airlock has been successfully hacked the user will have full access to the door operation interface normally restricted to silicons.

A hacking tool will remember the last 6 to 8 hacked airlocks.  No time is needed to again hack remembered airlocks.
Once the limit has been reached the least recently accessed airlock is forgotten. Hacking a remembered airlock will update the last accessed time.

Also adds a basic observer/listener pattern implementation to, for example, make it easier to catch when objects have been destroyed and clear references.

* Corrects and adds more sanity checking.

* Adds hacktool to uplink devices
2016-05-15 09:38:10 -04:00