Commit Graph

1264 Commits

Author SHA1 Message Date
Leshana
eae29b9d69 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into sink 2016-05-30 22:43:05 -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
Leshana
e004a8bfc0 Merge remote-tracking branch 'polaris/master' into sink
# Conflicts:
#	code/_onclick/item_attack.dm
#	code/modules/client/preferences.dm
#	code/modules/mob/living/carbon/human/examine.dm
#	code/modules/mob/living/simple_animal/hostile/hostile.dm
#	code/modules/mob/new_player/preferences_setup.dm
#	nano/images/nanomap_z1.png
#	vorestation.dme
2016-05-29 16:22:07 -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
Mark9013100
41de641287 Adds blue carpet stack 2016-05-27 22:34:35 -04:00
GinjaNinja32
beee32f237 Allow disabling styling of fake nanoui windows 2016-05-26 18:07:38 +01:00
Arokha Sieyes
8230732453 Merge branch 'sync' of https://github.com/VOREStation/Polaris into 05192016_sync 2016-05-19 23:52:00 -04:00
Neerti
95f49d0dff Merge pull request #1697 from Yoshax/medicalkitfix
Fixes combat medical kit being unbuyable
2016-05-19 14:30:31 -04:00
SinTwo
a87c8de3fd HTML5 and CSS3 (#1677)
* Updates to HTML5 and CSS3

* UI Tweaks and Fixes
2016-05-19 14:28:38 -04:00
Yoshax
50393fa2a7 Fixes combat medical kit being unbuyable 2016-05-19 18:19:43 +01:00
Mark9013100
2a2084a2b5 Buffs forensics investigation equipment crate 2016-05-18 23:16:22 -04:00
Arokha Sieyes
7914c9d943 Merge branch 'master' of https://github.com/VOREStation/Polaris into sync 2016-05-18 10:13:26 -04:00
SinTwo
47176f4912 Communicator Texting And UI Overhaul (#1670)
* Communicators ui moved to FakeNanoUI

* Removed test file.

* Back to NanoUI

* NanoUI

* Communicator Texting and UI overhaul.

* Comment Fixes
2016-05-18 09:29:07 -04:00
Arokha Sieyes
d7e65b22ba Merge branch 'master' of https://github.com/VOREStation/Polaris into sync 2016-05-16 18:31:38 -04:00
Yoshax
5cb4ae9879 Adds shot glasses
Cleans up a list in the booze vendor
Removes tea from contraband and puts into the normal product list in the booze vendor
Adds the shot glasses to the autolathe and makes glasses there no longer children of bucket recipes
2016-05-16 20:06:10 +01: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
Arokha Sieyes
9da2307e3f Fixes Loyalty Implants
Why would you define a proc on /mob/living/carbon/human for implanting something then ask to be passed your own src? Also why would you try to pass /job/datums as something to implant? Silly.
2016-05-14 18:08:35 -04:00
Arokha Sieyes
c55ae551d7 Fixes Loyalty Implants
Why would you define a proc on /mob/living/carbon/human for implanting something then ask to be passed your own src? Also why would you try to pass /job/datums as something to implant? Silly.
2016-05-14 17:50:12 -04:00
Arokha Sieyes
17a64bebea Merge branch 'master' of https://github.com/PolarisSS13/Polaris into breakfix
# Conflicts:
#	code/modules/mob/living/carbon/human/update_icons.dm
#	code/modules/mob/new_player/new_player.dm
#	vorestation.dme
2016-05-12 13:02:51 -04:00
Datraen
16366b8e3d Brings New Player Manifest, Load Slot into FakeNanoUI. 2016-05-12 00:14:23 -04:00
Arokha Sieyes
96f97a8c4b Adds televore, and cherrypicked a UI improvement from Polaris 2016-05-11 23:02:01 -04:00
Datraen
4456f77d75 Merge pull request #1551 from Zuhayr/master
Makes slime people more interesting and thematic.
2016-05-11 02:34:50 -04:00
Leshana
e2b4876a5d Resolves Issue #8 - Making Juke Boxes hackable
* Created new jukebox type with new features.
* Adds all of our songs to the repository.
* Adds all of our songs to the jukebox.
* Makes juke boxes hackable.
* Modify areas to enable playing of frequency-altered sounds.
* Replaced normal jukeboxes with our nice ones on the map.
2016-05-09 22:50:45 -04:00
Hubblenaut
8d7446a3c4 Adds drop pouches as alternate webbings 2016-05-06 21:00:28 +02:00
Zuhayr
6edb8b31f3 Made slimes more interesting. 2016-05-06 04:07:52 +09:30
Datraen
44edf86ccb Merge pull request #1455 from Yoshax/gendertweak
Gender tweaks and adjustments
2016-05-05 10:18:25 -04:00
Datraen
efbe346c12 Removes circuit boards from relevant checks for microwaves, cooking. 2016-05-05 01:24:38 -04:00
Yoshax
4d160c261d Revamps cargo supply code to allow for nicer code (#1508)
* Adds lunchboxes to dinnerware vendor and buffs the amount of ingredients the chef starts with

* Revamps cargo supply code to allow for multiple items to be ordered on one line and nukes the remaining multiple lined orders

Corrects a number mistake

Fixes some list formatting

Actually fixes list formatting

* Removes a stray comma
2016-05-04 17:20:22 -04:00
Datraen
beda3185eb Reverts the second mob clean up because of incomplete implementation.
This caused an error that would then cause machinery to hang on the server, and was reproduced successfully.
2016-05-04 00:24:55 -04:00
SinTwo
5ae20ceb8b Buildables v1.2 (#1517)
* Removes text2path, adds constructability to a few things, adds a locker_painter.dm, and several fixes.

* Fixes Maps due to working on ancient versions.

* Path error.

* Adds a missing ..()
2016-05-03 22:18:12 +01:00
Anewbe
22a9b32a29 Fixed the map thing and a few other issues. 2016-04-29 19:08:04 -05:00
Anewbe
7b1eb6c099 Refactors specialized satchels as children of the regular (leather) satchel 2016-04-29 18:44:28 -05:00
Kelenius
98badae45f Merge branch 'master' into cleanupTwo 2016-04-21 11:41:32 +03:00
Yoshax
aa592e3b35 Gender tweaking
Limits biolgical gender by species and defaults to male/female.
Can also set gender identity which determines which is displayed upon examination and suchlike along with being shown in medical records
2016-04-20 20:07:14 +01:00
Neerti
d6b58cfe8d Ambition system tweaks
Ports Bay's port of this.  Did it manually because of ugly merge conflicts.
What Psi did:
Admins can now see and set ambitions in antag panel.
Makes is_special_character() a bit better.
What I did:
Setting ambitions, with the verb or with admin powers, is now logged.
Round-end text changed to be blue instead of bolded, for better readability.
Makes the ambition system known to the antag at the bottom of the chat log instead of before the 'you are a X' prompt.
2016-04-06 06:27:32 -04:00
Datraen
ae18758550 Replaces previous microwave hackfix with proper checks.
Previously a second list was used, rather than a proper removal of the components_list. The procs were restricted rather than checking for if it was a machine and proceeding appropriately.
2016-04-02 18:39:34 -04:00
Datraen
459f70ba46 Merge pull request #1319 from Mark9013100/3/31/2016medweb
Adds the medical webbing
2016-04-01 16:53:58 -04:00
Mark9013100
f51a350281 Adds the medical webbing 2016-04-01 08:11:23 -04:00
Mark9013100
d637e6bc8e Janitor Edits 2016-04-01 04:55:39 -04:00
Atlantis
b239cf4b19 Adds synthetics to the crew manifest
- Synthetics now show on the crew manifest properly. This might as well be a bug fix since they already had the category, it just didn't work at all, since they don't have official security/medical/employment records.
- This does not mean synthetics are part of crew. They just show on the crew manifest for the sake of knowing who is in game when you are joining. I often saw people join a specific position, only to see that all work has already been done by a cyborg.
- As a note, Syndicate/Combat module cyborgs don't show on the manifest. Emagged cyborgs do show, however.
- This does not (probably) support the PDA manifest (which is currently broken anyway)
- Example screenshot: http://i.imgur.com/RSPuuom.png

🆑
rscadd: Cyborgs and the AI now show on the crew manifest.
:/cl:
2016-03-31 17:25:28 -04:00
Yoshax
9b7b8656ba Merge remote-tracking branch 'upstream/master' into progressbars 2016-03-30 00:31:03 +01:00
PsiOmegaDelta
84799befca Can now toggle the progress bar visibility.
Enabled  by default.
2016-03-30 00:13:41 +01:00
Neerti
ac8ad8bb08 Merge pull request #1270 from Datraen/MicrowaveFix
Microwaves no longer try cooking their components while cooking.
2016-03-28 00:20:36 -04:00
Mark9013100
26358bf1ab Map edits, minor fixes 2016-03-28 00:02:20 -04:00
Datraen
725ff4d03f Microwaves no longer try cooking their components while cooking. 2016-03-27 15:49:06 -04:00
EmperorJon
3026361ff4 Merge pull request #1231 from Neerti/3/22/2016_self_objectives
Adds a new optional 'ambitions' system.
2016-03-27 17:38:22 +01:00
Neerti
96e52f5af0 Merge pull request #1229 from SinTwo/construction_update
Construction update
2016-03-26 15:45:19 -04:00
Datraen
357fd67a65 Merge pull request #1159 from Kelenius/playingWithTravis
Attempts to port bay's travis update attempts
2016-03-26 13:18:55 -04:00
SinTwo
b356f5cf21 Construction Update 2016-03-25 16:02:36 -04:00
Mark9013100
5f734effbc Armor can now hold maglights 2016-03-23 20:14:56 -04:00