Commit Graph

13050 Commits

Author SHA1 Message Date
Leshana
3781494933 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into sync 2017-02-23 18:25:37 -05:00
Anewbe
3bd665d797 Merge pull request #3001 from Neerti/2/2/2017_planet_stuff
Adds framework for planetary maps
2017-02-23 15:18:03 -06:00
Spades
789037328d Merge pull request #1007 from Yoshax/voxvoxvox
Makes Vox spawn with a fancy dancy double emergency Phoron tank
2017-02-23 12:41:37 -05:00
Anewbe
9d0fd9b866 Merge pull request #3005 from Leshana/papershredder-enhancement
Enhances the Paper Shredder
2017-02-23 11:28:28 -06:00
Yoshax
64fd611a2c Makes Vox spawn with a fancy dancy double emergency Phoron tank 2017-02-23 13:48:50 +00:00
Leshana
d7b82fc719 Added new "default_apply_parts" facility to machines to create default parts.
* Every constructable machine with a circuit board needs to create its required parts in its constructor.  These parts must be the same parts specified in the machine's circuit board, otherwise you get the wrong parts when you deconstruct.  This creates an opportunity for error which we can eliminate by reading the circuit board's part list and just adding those to the machine directly!  Plus its less tedious.
* Implemented it on the jukebox.
2017-02-22 17:28:24 -05:00
Leshana
f0c30b2817 Fixed broken icon states on jukebox.
* Code referred to icon_state "panel_open" but was missing from the dmi.  I had a copy of it from elsewhere, so added it in.
* It wasn't calling update_icon() on New() so newly constructed jukeboxes started off looking unpowered. Fixed.
2017-02-22 17:28:08 -05:00
Arokha Sieyes
01aa1a6f97 Merge pull request #995 from VOREStation/telescience
Make Telescience Great Again
2017-02-22 09:44:35 -05:00
Neerti
6377efd763 Fixes a few things, most notably the human layering number. 2017-02-22 00:36:47 -05:00
Cameron653
43f9f33a44 Merge pull request #1000 from Cameron653/master
Tempest saddlebags , saddle bags adjustments
2017-02-21 21:14:42 -05:00
killer653
63ae45159d Tempest item, saddle adjustments 2017-02-21 20:55:09 -05:00
Leshana
dbd3622588 Enhances the Paper Shredder
* Makes the paper shredder constructable and deconstructable.
* Switches to some new sprites which are animated!
* Machine now requires power, icons respond to power on/off etc.
2017-02-21 19:21:32 -05:00
Arokha Sieyes
77ada345d7 Extra ways to get backup implants
Adds them to medical vendors (by the box) and producable by an autolathe (by the single)
2017-02-21 19:01:48 -05:00
Anewbe
2de037fbbf Ports a bunch of fluff stuff 2017-02-21 13:50:14 -06:00
Leshana
eb92df28c2 Updates to areas to make them be protected from telesci 2017-02-21 10:44:35 -05:00
Neerti
91dd3348c5 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into 2/2/2017_planet_stuff
# Conflicts:
#	code/modules/mob/living/carbon/human/human_movement.dm
2017-02-20 19:06:25 -05:00
Neerti
836d8dfa3f More stuff, finalizes it I hope. 2017-02-20 18:28:31 -05:00
Arokha Sieyes
493be12110 Merge pull request #984 from VOREStation/resleeving
Resleeving Stuff
2017-02-20 18:14:06 -05:00
Leshana
7549d276db Lets leave the bit about cloning pods in there on the off chance someone has one for some reason. 2017-02-20 15:28:05 -05:00
Anewbe
09e7d5aef9 Buffs Space Vines 2017-02-20 14:22:18 -06:00
Arokha Sieyes
a6ed469aca Finishing touches
Make mind records get removed when you cryo.
Added resleeving manual.
Commit virgo-7 because mapmerge constantly says it has changes. BeyondCompare says there aren't any. Probably some formatting change but it'll probably do it for everyone until I do it.
Move where backup implants are (put them in resleeving room)
Only Posibrains are indigestible. MMIs are. Squishy brainmeat!
Unrelated icon change to station announcements by admins.
2017-02-19 20:46:55 -05:00
Arokha Sieyes
74018ebd34 Basically replaced biological cloning so far 2017-02-19 00:01:14 -05:00
Yoshax
dad4e19785 Does custom food stuff 2017-02-19 01:02:12 +00:00
Leshana
19efa2ae5b Jukeboxes are coded to have hackable wires, but don't respond to wirecutters or multitools. Fix that. 2017-02-15 21:06:38 -05:00
Arokha Sieyes
eef3e32bdf Merge pull request #959 from Screemonster/burninatingtheairlocksAGAIN
Fire now damages doors.
2017-02-15 18:13:32 -05:00
Screemonster
924dcdb8cb shutters immune, firelocks now equivalent to rwalls 2017-02-15 15:20:42 +00:00
Screemonster
922fe1db81 makes fire even greater than it was before 2017-02-15 03:56:09 +00:00
Yoshax
59796ae0e8 Adds flash magazines 2017-02-15 03:37:43 +00:00
Arokha Sieyes
c141e8b440 Merge pull request #954 from VOREStation/roguelike
Miner Minigame
2017-02-14 20:55:10 -05:00
Arokha Sieyes
e4557b0724 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into sync 2017-02-14 20:29:57 -05:00
Arokha Sieyes
cb54ebb001 Merge pull request #945 from Screemonster/tamperbugfix
bugfix in anti-tamper proc & screesuit
2017-02-14 19:17:56 -05:00
Anewbe
95a670e562 Merge pull request #2994 from Leshana/backpack-drag-issue
Fixes dragging items with storage onto an occupied hand
2017-02-14 17:00:05 -06:00
Yoshax
cad3a04113 Merge branch 'master' of https://github.com/VOREStation/VOREStation into secbalance 2017-02-14 22:03:26 +00:00
Arokha Sieyes
9988477f42 Final work on belt mining 2017-02-14 16:36:34 -05:00
Screemonster
ce28b35275 Adds Krak-B-Gone, a silicate spray for fixing windows 2017-02-14 18:29:55 +00:00
Arokha Sieyes
ff6790b174 Console percentage and sizing fixed but not button
Dunno why button dun work
2017-02-14 01:02:07 -05:00
Arokha Sieyes
c3d0349531 Scoring fix, overlays fix, map tweaks to v7 2017-02-13 22:08:42 -05:00
Arokha Sieyes
85fbc527a3 Nearing playtest time 2017-02-13 20:24:54 -05:00
Yoshax
3162c723d9 Security non-lethal balance 2017-02-13 15:49:35 +00:00
Arokha Sieyes
9817d67461 More initial codework on rogue miner. 2017-02-12 21:04:31 -05:00
Screemonster
a7ae4fd4ab bugfix in anti-tamper proc 2017-02-13 01:42:33 +00:00
Arokha Sieyes
6d364b9f9e Beginning of rogue mining zone 2017-02-12 01:29:06 -05:00
Arokha Sieyes
f77239909d Framework for new shuttle
Sprites and floor tiles and whatnot.
2017-02-11 21:55:37 -05:00
Arokha Sieyes
b3ebee2d2f Merge Yosh's R&D map changes 2017-02-11 00:26:26 -05:00
Arokha Sieyes
75e94253ed CC Map Tweaks & 2 New Shuttles
Okay, the administration shuttle isn't new, I just made it more comprehensive.

-Made it easier to create multi-destination shuttles for player-use when not antags. The existing ones were pretty geared towards the Mercenary game mode. Now it's pretty easy to make a shuttle that goes a bunch of places.

-Redesigned admin shuttle (pac-man shaped one at CC) to be multi-destination shuttle more capable of supporting RP. Can be used on 'hard' away missions by putting in the appropriate area in the away mission (`/area/shuttle/administration/away_mission`). Or, hell, include it on every new away mission and say that it's the E-Z mode version of that mission.

-Added new AwayMission shuttle to Dock 1. By default it can only go between the station and the old abandoned construction site, but if it detects that there's a map loaded with the appropriate area (`/area/shuttle/awaymission/away`), then it will be available for travel to that destination as well, listed as "Unknown Location". The shape of the area should be 13 wide x 5 tall. The shuttle opens to the right, in the center of the 5.

-Redid several parts of Centcom. Nothing too huge. Mostly made some hallways less barren, allowed access to the trams area on the right by default for shift-end people to use the trams, tweaked a couple of hallways to make sense (going through the bridge to get to a security checkpoint?) and added a couple more potted plants for good measure. Mostly added windows because several hallways were just... like... I feel like I'm underground.

-Changes on z1: Added away shuttle to dock.
-Changes on z2: Lots, see above.
-Changes on z4: Add area for Away Mission shuttle.
2017-02-10 23:45:59 -05:00
Anewbe
2eaf2c6ebb Merge pull request #2993 from VOREStation/strref-fix
Re-fix for #2312
2017-02-09 21:24:52 -06:00
Anewbe
cb0e1d784a Merge pull request #2992 from VOREStation/langlist
Updates adv scanner known_implants
2017-02-09 21:24:17 -06:00
Leshana
283b58e93d Fixes dragging clothing with storage onto an occupied hand
* If you mouse-drag certain items onto a hand which is already holding something, the item goes into limbo.
* The reason this happens is that the standard code handling drags is directly calling usr.u_equip, despite the comment on that proc clearly saying never to do that.  So it just throws it to limbo and the next line attempting to put it in hand does nothing becuase the hand is occupied.   Better way is to call unEquip, so the item will drop on the ground if it fails.
* Fixes https://github.com/VOREStation/VOREStation/issues/394
2017-02-09 14:49:13 -05:00
Arokha Sieyes
d786da6b7d New alt-titles for HoP and Janitor
* "Deputy Director" for HoP
* "Maid" for Janitor

Fixes #924
2017-02-08 16:52:09 -05:00
Arokha Sieyes
6d0610d716 Merge pull request #933 from VOREStation/lightmsg
Remove floor light toggle broadcast
2017-02-08 16:23:13 -05:00