Commit Graph

7124 Commits

Author SHA1 Message Date
Aronai Sieyes
7ff0493074 Merge pull request #2998 from Jwguy/Silver-AwooCosplayCrate
AwooCosplayCrate
2018-02-10 23:06:35 -06:00
Aronai Sieyes
526e886a21 Merge pull request #2994 from Verkister/badboi
Adds a fancy new voremob.
2018-02-10 23:04:47 -06:00
Silver
8c36391925 Propernaming for VIRGO PR#3000
https://github.com/VOREStation/VOREStation/pull/3000
2018-02-08 17:45:12 -06:00
Silver
13b710fb61 Silver-ContrabandUpdate
Adds AwooCrate and MlemCrate to Contraband Supplypack. (These show up under 'supplies' in a hacked cargo console and are quite expensive)
2018-02-08 13:01:51 -06:00
Silver
ef4d87a352 AwooCosplayCrate
Adds Wolfgirl Cosplay Crate to Supplypacks under Recreation.

Adds Wolfgirl Replica Sword and Autumn Shield.

Adds the above and three existing items to aforementioned crate.
2018-02-08 12:57:18 -06:00
Verkister
d240032910 some changes 2018-02-08 10:57:45 +02:00
Verkister
7afc963393 Adds a fancy new voremob.
-"corrupt hound". Basically a messed up evil feral borgo.
-Currently only available without bus shenanigans through the dangerous pred crate. Could be added to some expeditions and such I guess.
-Loot drops illegal borg upgrade module.
2018-02-08 10:11:42 +02:00
Leshana
1d0f5262d8 Merge remote-tracking branch 'upstream-polaris/master' into polaris-sync-2018-02-07
# Conflicts:
#	code/__defines/subsystems.dm
#	code/controllers/master_controller.dm
#	code/controllers/subsystems/atoms.dm
#	code/game/machinery/Sleeper.dm
#	code/game/machinery/doors/airlock.dm
#	code/game/machinery/vr_console.dm
#	code/game/objects/items/devices/communicator/phone.dm
#	code/game/turfs/flooring/flooring_decals.dm
#	code/modules/admin/admin_verbs.dm
#	code/modules/mob/living/carbon/carbon.dm
#	code/modules/multiz/movement.dm
#	code/modules/projectiles/gun.dm
#	code/modules/shuttles/shuttle.dm
#	code/modules/shuttles/shuttles_web.dm
#	icons/obj/doors/doormed.dmi
#	maps/southern_cross/items/headset_sc.dm
#	maps/southern_cross/southern_cross-3.dmm
#	vorestation.dme
2018-02-07 19:30:50 -05:00
Anewbe
0d7fc11540 Merge pull request #4736 from elgeonmb/patch-4
moves us out of kara, pt 2
2018-02-06 21:07:56 -06:00
Neerti
3fd1571a4b Merge pull request #4724 from Anewbe/ghettoChutes
Fixes ghetto chutes
2018-02-06 14:14:30 -05:00
elgeonmb
b0fd486e27 moves us out of kara, pt 2 2018-02-05 23:22:45 -08:00
Neerti
828b594701 Merge pull request #4716 from VOREStation/vplk-ss-atoms-shuttles
Atom Initializing and Shuttles Subsystem + CALLBACK
2018-02-05 23:39:47 -05:00
mistyLuminescence
d04faba6c4 Machetes now fit on belts (#4725)
* Knives and machetes now fit on belts

* just machetes
2018-02-05 22:29:37 -06:00
Leshana
5847319443 Update every initialize() proc to return an initialize hint.
* Yes, all of them.
* Also did a few corrections to redundant New() and broken Destroy() along the way
* Renamed the turf_initializer.initialize() proc to InitializeTurf to avoid confusion.
* Subsumed /area/proc/initialize into /atom/proc/initialize() - Made /area's LateInitialize to get same behavior as before.
2018-02-05 15:50:13 -05:00
Spades
2dfa526b7a Merge pull request #2972 from VOREStation/aro-lang
Removes several ways to know every language
2018-02-05 05:21:02 -05:00
Anewbe
08e44f8a5a Merge pull request #4721 from mistyLuminescence/syndietoolbox
Fixes syndie powertool toolboxes
2018-02-05 01:57:02 -06:00
Anewbe
3e31b6678f Merge branch 'master' of https://github.com/PolarisSS13/Polaris into ghettoChutes 2018-02-05 00:53:33 -06:00
Anewbe
67e22cf0a6 Closets and Mechs no longer prevent death by freefall 2018-02-05 00:53:12 -06:00
mistyLuminescence
da4bd82a5d Adds more med gear to R&D and Cargo (#4691)
* Adds more med gear to R&D and Cargo

* standardises + adds sprites

* Removes cargo crate
2018-02-04 22:18:36 -06:00
Aronai Sieyes
bb09406ea0 Merge pull request #2934 from Verkister/yummytrash
Trashcan perk refactor and slight expansion.
2018-02-04 16:56:47 -05:00
mistyLuminescence
79f774e591 Fixes syndie powertool toolboxes 2018-02-04 21:17:51 +00:00
Verkister
f553219bbd Squashed commit of the following:
commit b3d348258c4c93a1df81652bdf68fd00f4130369
Author: Verkister <superverkelian@hotmail.com>
Date:   Sun Feb 4 22:40:08 2018 +0200

    Squashed commit of the following:

    commit 5faa5f9d063e57400584ab1ae458e626629b6842
    Author: Verkister <superverkelian@hotmail.com>
    Date:   Sun Feb 4 22:31:10 2018 +0200

        Update pai.dm

commit fd4bbdc6b99d74d94befb440ffe5e0c23a98a918
Author: Verkister <superverkelian@hotmail.com>
Date:   Sun Feb 4 11:28:58 2018 +0200

    Makes pAI cards, AI cards, and posis "edible"
    -Also makes it so that pAI cannot fold out if inside a gut.

commit 1d13c207240c4bc296b188533e8cf50b1424cc36
Author: Verkister <superverkelian@hotmail.com>
Date:   Sun Feb 4 10:40:38 2018 +0200

    some more trashcan refactoring

commit 28d02c272dbd218d2d91c91fb1ecec999b9dd05e
Author: Verkister <superverkelian@hotmail.com>
Date:   Sat Feb 3 13:32:14 2018 +0200

    Trashcan perk refactor
2018-02-04 22:43:02 +02:00
Arokha Sieyes
686c601e24 Further translator tweaks 2018-02-04 13:56:25 -05:00
Cameron653
9e52040d5a Loadout Text-To-Speech device. (#4697)
* TTS Device

* Makes it a proper /device

* boop

* to_chat and message change
2018-02-03 22:47:01 -06:00
Anewbe
daf124fd83 Merge pull request #4703 from VOREStation/aro-telecheck
Adds generic can_telecomm() proc, applies to Communicators
2018-02-03 22:46:16 -06:00
Anewbe
7b8c116c2b Merge pull request #4698 from Cyantime/patch-1
Reorder some of the planetary fall trigger
2018-02-03 16:08:27 -06:00
Anewbe
95024db793 Merge pull request #4705 from VOREStation/aro-adhocfallback
Add an adhoc radio fallback mechanism
2018-02-03 14:45:08 -06:00
MarinaGryphon
72318d46b6 Replaces most of the gender macros. (#4681)
* Fixes #4632.

* 1:27 am coding best coding

* fixes a warning

* Removes the last of the gender macros. Gender is dead.

* gender II: the travis-ing

* linebreaks are dead too.

* oops i accidentally the gender, also ambiguous gender is now taken into account for get_visible_gender
2018-02-03 14:40:09 -06:00
Anewbe
b924aab573 Merge pull request #4700 from Mechoid/Tyranny_Of_The_Hood
Suit modkits can now be used for all hooded things.
2018-02-03 02:59:10 -06:00
Leshana
38f20304ca Initialize procs for virgo 2018-02-03 01:00:57 -05:00
Leshana
cef001bf2a Update every initialize() proc to return an initialize hint.
* Yes, all of them.
* Also did a few corrections to redundant New() and broken Destroy() along the way
* Renamed the turf_initializer.initialize() proc to InitializeTurf to avoid confusion.
* Subsumed /area/proc/initialize into /atom/proc/initialize() - Made /area's LateInitialize to get same behavior as before.
2018-02-03 01:00:57 -05:00
Aronai Sieyes
300bcd123f Merge pull request #2935 from VOREStation/aro-radiotweaks
Headset/Radio Tweaks for Explorers Mostly
2018-02-03 00:41:44 -05:00
Arokha Sieyes
b7c4f50f2b POLARIS: Add an adhoc radio fallback mechanism
Allows subspace radios (eg headsets) to have adhoc_fallback enabled on them, which allows them to turn into shortwaves until they reestablish telecomms. I'm doing this for exp/sar/pilot headsets on our server, you can too if you want. What else are those giant antennas for? Up to you. This doesn't change anything for you unless you enable adhoc_fallback on something, but you can use it if you want!
2018-02-02 18:05:39 -05:00
Arokha Sieyes
3c5e6d620a Adds generic can_telecomm proc 2018-02-02 17:59:04 -05:00
Arokha Sieyes
760ca5f945 POLARIS: Add an adhoc radio fallback mechanism
Allows subspace radios (eg headsets) to have adhoc_fallback enabled on them, which allows them to turn into shortwaves until they reestablish telecomms. I'm doing this for exp/sar/pilot headsets on our server, you can too if you want. What else are those giant antennas for? Up to you. This doesn't change anything for you unless you enable adhoc_fallback on something, but you can use it if you want!
2018-02-02 16:16:32 -05:00
Arokha Sieyes
04c8942bf7 POLARIS: can_telecomm() proc
Attempts to discover if two parties can talk to each other using telecomms, and as a PoC applies it to communicators which attempt to get to their node via the can_telecomm proc.
2018-02-02 16:13:31 -05:00
Cerebulon
e1979e9672 Adds a variety of dead things for mapping (#4680)
* Adds a variety of remains for mapping use.

* fixed icons, typos
2018-02-02 13:11:36 -06:00
Verkister
9fe7b5901c Broadens the scope of trashcan perk a little.
-Adds a bunch of additional "trash" types that aren't included in obj/item/trash, such as:
-Those spicy cardboard tubes called flares, preferably expended but whatever.
-Glow sticks, full of delicious looking juice you'll regret.
-Toy figures, become an impostor predator.
-Ciggy butts, yum!
-Banana peels.
-Cardboard sheets, interesting flavor not included.
-Crumpled papers. Hide that lewd drawing in seconds.
-Broken light bulbs and tubes. Don't do this it's not healthy for most people.
-Broken bottles, see the warning above.
-A selection of emptied vendor drinkables (small milk, small chocomilk, coffee, tea, dutch choco, ice cup, ramen cup, and paper cups)
-Those pesky torn inflatables.
-And "burnt mess" with reduced toxin content via vore digestion.
2018-02-02 15:53:56 +02:00
Leshana
4f98fad36b Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2018-02-01
# Conflicts:
#	.travis.yml
#	code/_away_mission_tests.dm
#	code/modules/admin/verbs/mapping.dm
#	code/modules/mob/living/carbon/human/update_icons.dm
#	html/changelogs/.all_changelog.yml
#	maps/southern_cross/southern_cross-1.dmm
#	maps/southern_cross/southern_cross-3.dmm
#	maps/southern_cross/southern_cross-6.dmm
#	nano/images/nanomap_z1.png
#	nano/images/nanomap_z10.png
#	nano/images/nanomap_z2.png
#	nano/images/nanomap_z3.png
#	nano/images/nanomap_z5.png
#	nano/images/nanomap_z6.png
2018-02-01 23:55:47 -05:00
Mechoid
e5e2a88621 Suit modkits can now be used for hoodies. 2018-02-01 20:40:11 -08:00
Cyantime
4c27b60e2b Reorder some of the planetary fall trigger 2018-02-01 20:12:26 -05:00
Neerti
504593a01e Merge pull request #4696 from Woodratt/01312018_guncabhotfix
Gun Cabinet hotfix
2018-02-01 02:51:02 -05:00
Woodratt
f68cf380ae Gun Cabinet hotfix
- Should fix explorers not being able to get into their gun cabinets
2018-01-31 23:13:30 -08:00
Neerti
24569fb95d Merge pull request #4690 from Woodratt/01312018_SC_Stationmapfixes
Further Map Fixes and Adjustments
2018-02-01 01:20:06 -05:00
Leshana
612a75cb49 Prevent communicators from connecting to the exonet when off station. 2018-01-31 21:02:22 -05:00
Neerti
c18ce47bff Merge pull request #4683 from Woodratt/01302018_SC_POIMAP
Southern Cross POI adjustment and Map adjustments
2018-01-31 15:42:48 -05:00
Woodratt
ed29353021 Further Map Fixes and Adjustments
- Deck 3 Port Airlock fixed
- Vent added to cargo delivery office to fix over pressure
- Windoor in Robotics given proper access and named
- Parachute crate added to pilot areas
- Access around cargo made more consistent
- Fixed first deck starboard hallway area
- Pilots now have access to maintenance around the hangars
- More ATMs added
- Center door on bridge removed
- Open sign from Bar borrowed for cafeteria as well
- Critical addition, Dog bed in HoP office
- Fixed T-comms turrets yet again
- Adjustments to engine room allowing for a second set of TEGs to properly be set up (Thanks to Kerbal/Mazian). Also moved vent control to a different position to stop a certain headmin from repeatedly hitting it
2018-01-31 05:11:23 -08:00
Arokha Sieyes
17723b7df6 Cleans up references to assistant
Defines the USELESS_JOB value as "Visitor"
2018-01-31 00:55:13 -05:00
Aronai Sieyes
6c2840ef9e Merge pull request #2895 from Verkister/doofle
Adds dufflebags and saddlebags to utility loadout.
2018-01-30 17:41:41 -05:00
Aronai Sieyes
03319e4597 Merge pull request #2811 from Verkister/otiepoop
Otie fixes and tweaks plus another new variant.
2018-01-30 16:21:55 -05:00