Commit Graph

64 Commits

Author SHA1 Message Date
Arokha Sieyes 508ea0d6a3 Merge pull request #2775 from VOREStation/syncomatic
Polaris Sync
2018-01-17 18:36:35 -05:00
Arokha Sieyes ff228754b3 Merge polaris sync 01 17 2018
Planes, layers, human/update_icon()
2018-01-17 17:56:51 -05:00
Leshana fe431c8e46 Trims back wilderness code that was dependent on tether map.
* Reverted random.dm back to Polaris as there is no need for the VOREStation customs.
* Fixed /obj/random/outside_mob so it will actually work (You can't set vars on a type!)
* Removed all wilderness code outside of the tether map.  It was only setting life_disabled on mobs spawning there. We can do that with a subsystem or by dynamic maploading instead.
2018-01-17 15:23:22 -05:00
Spades b441ccd6e3 9mm pistol updates (#4480)
* These aren't supposed to be here!!

* Adds new Security pistol and large capacity magazines

* Removes new pistol from Security spawns

* Removed references of Beretta because it's not one
2018-01-14 14:45:15 -06:00
Mechoid 5efc484595 Makes knives all knives. 2018-01-12 18:02:07 -08:00
Arokha Sieyes d998f36c38 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into sync2018
# Conflicts:
#	code/game/objects/structures/signs.dm
#	code/modules/mob/living/carbon/human/human.dm
#	code/modules/mob/living/carbon/human/species/station/station.dm
#	code/modules/mob/living/carbon/human/species/virtual_reality/avatar.dm
#	code/modules/mob/living/carbon/human/update_icons.dm
#	code/modules/organs/organ_icon.dm
#	maps/southern_cross/southern_cross-1.dmm
#	maps/southern_cross/southern_cross-3.dmm
#	maps/southern_cross/southern_cross-6.dmm
#	vorestation.dme
2017-12-26 23:07:58 -05:00
mistyLuminescence c986d57c34 Med Pill Blue Pill (#4404)
* Fixes 4412
* Rebalanced medical gear spawns
* Pill bottle code touched up
2017-12-23 14:45:24 -08:00
killer653 3a2093ef40 Polaris sync 2017-12-21 04:01:07 -05:00
Anewbe 6e3bbd31c0 Removes the mosin-nagant, moves the sprites 2017-11-22 01:14:14 -06:00
Woodratt 2684942049 Map fixes
Multiple Map Issue Fixes
2017-11-18 19:17:48 -08:00
killer653 11c195debb Polaris Sync 2017-11-04 13:37:13 -04:00
mistyLuminescence f67a3858cd Plushie tweaks! 2017-10-31 15:47:00 +00:00
killer653 0c480ec15f Polaris sync 2017-10-27 15:30:24 -04:00
mistyLuminescence ae308a3a91 Reworks cryopod storage 2017-10-20 19:14:45 +01:00
Cameron Lennox 15a6472d14 Pol Sync 2017-10-08 17:44:25 -04:00
killer653 bddfa16f82 Polaris sync 2017-09-15 21:17:34 -04:00
killer653 8b7c0576a5 Fixes legcuffs 2017-09-12 20:47:42 -04:00
Neerti 4bfcec55f2 work 2017-09-04 21:52:47 -04:00
killer653 468e73c7f3 Polaris sync 2017-08-06 19:07:17 -04:00
Cyantime 3f48e8ae07 Attempted wilderness performance increase (#1841)
* Attempted wilderness performance increase

* might as well

* Edit comments

* Moves alien change out of polaris file
2017-07-19 15:30:22 -04:00
Woodratt e75c3887b7 Woodrat breaks map stuff
Added SC map files for further work. Including hopefully all the related files.

New airlock sprite thanks to Virgo, with a alternate non-see through sprite.

Changes to the space and transit tiles (ported from bay).

Changes done to the NC map that should bring it more up to date with changes (shield defuse stuff and minor bug fixes)
2017-07-02 18:53:17 -07:00
Leshana 197a648795 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2017-06-01
# Conflicts:
#	code/game/objects/structures/crates_lockers/closets/secure/security.dm
#	code/modules/multiz/movement.dm
#	code/modules/projectiles/ammunition/magazines.dm
2017-06-01 17:27:00 -04:00
Spades 3ff9d441f9 Finishes fixing ammo inconsistencies 2017-05-27 04:39:49 -04:00
Spades 8579adcc53 Naming convention of ammo is now consistent
s = Speedloaders. (Functionally the same as clips, but they're not
_really_ the same thing, just in case we change these later.)
c = Clips. (Can also be used to fill other magazines.)
m = Magazine. (Holds ammo rounds.)
a = Ammo. (Individual rounds of ammo.)
2017-05-26 19:32:23 -04:00
Arokha Sieyes ef43dfa816 Add some 'single' random spawns to the maps
A single netgun will always spawn somewhere on the map, but the location is random.
Either a bluespace harpoon or a translocator will spawn somewhere on the map, but never both, and location is also random.

Keep in mind they have a chance of spawning in maint where they can be easily grabbed... or spawned into one of those closed-off walled-in single rooms that are occasionally in the walls with stuff in them, so you might not see them every shift.
2017-05-22 18:12:37 -04:00
Arokha Sieyes c910985263 Make illegal maint spawns a little more fun
Fuzzy cuffs, radio jammers, anti-photon grenades, syndie radio keys
2017-05-21 21:09:28 -04:00
Anewbe e9c4b5a3eb Merge branch 'master' of https://github.com/PolarisSS13/Polaris into cosmetic_things
# Conflicts:
#	icons/mob/back.dmi
#	icons/mob/items/lefthand.dmi
#	icons/mob/items/righthand.dmi
2017-04-07 16:11:50 -05:00
Anewbe 8e9db2b7d4 Aprons now have pockets 2017-04-02 00:28:20 -05:00
Anewbe 7bb3f5fbb7 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into cosmetic_things
# Conflicts:
#	code/datums/supplypacks/medical.dm
#	code/game/objects/structures/crates_lockers/closets/wardrobe.dm
#	code/modules/clothing/shoes/miscellaneous.dm
#	code/modules/clothing/suits/labcoat.dm
#	icons/mob/back.dmi
#	icons/mob/feet.dmi
#	icons/mob/human_face.dmi
#	icons/mob/items/lefthand.dmi
#	icons/mob/items/righthand.dmi
#	icons/mob/suit.dmi
#	icons/obj/clothing/shoes.dmi
#	icons/obj/clothing/suits.dmi
#	icons/obj/storage.dmi
#	maps/northern_star/polaris-2.dmm
#	maps/northern_star/polaris-5.dmm
2017-04-01 12:45:45 -05:00
Anewbe 7130d56b80 Merge pull request #3064 from Woodratt/WR_SC_Changes
WR_SC_Map_Changes
2017-03-08 19:58:46 -06:00
woodratt 19fb047f01 WR_SC_Map_Changes
- Fixes sprite issues with departmental intercoms.
- Tweaks to the random objects dm
- Copies Bay's flora and warning sign list, as well as ports some of their signs.
- Addition of a couple new floor decals.
- New table preset, wooden reinforced.
2017-03-08 17:44:48 -08:00
Leshana a5a805414b Fixed paths references to obsolete path /obj/item/clothing/shoes/combat
* It was changed in most places to /obj/item/clothing/shoes/boots/combat but some were not.  The changling subtype prevented any compile errors.
2017-03-06 21:58:39 -05:00
Anewbe 2de037fbbf Ports a bunch of fluff stuff 2017-02-21 13:50:14 -06:00
Anewbe 7417bef794 Boots are now a subtype of shoes 2017-02-05 16:17:41 -06:00
Anewbe 2c86a0a465 Returns the Vox, who now breath Phoron 2017-01-06 17:49:39 -06:00
woodratt a3fc7dad15 1.6.2. Map Tweaks Random Loot lists yet another Armory Overhaul.
- Taken from Bay and edited a bit, maintenance now has a chance to have some randomized items in crates and on racks. Nothing extremely exciting or game changing should spawn yet, sadly. Probably still needs some adjustments and really needs some additions but works at this stage for live testing to see how badly RNG wants to spawn sin pockets and botany gloves.
- Minor map adjustments to both z-levels 1 and 2. Including things such as a mirror placed on the technomancer ship. Light adjustments on the main z-level. Removing redundant lightswitches, adding lightswitches, removing redundant newscasters. Fixing other old mapping errors.
- Largest chunk of change, rework of the armory. Image Link Two sets of all of the armor except for the riot armor has been removed from the armory. A 'tactical equipment' storage room has been readded (warden access) with the combat armor, lethal ammo, and two of both the energy weapons and ballistic guns moved to it. Four energy weapon power cells have also been added to said equipment room as well as one magazine of lethal 45 ammo (it was 5 magazines before, this makes it a even and less OCD annoying 6, like the rubber magazines).
- Practice ammo moved from the armory to the firing range on a conveniently empty table.
- Defib units now available in medical, and one in both first aid checkpoints.
2016-11-21 14:41:13 -08:00
Anewbe d76e4cd075 Flashlights use device cells 2016-10-16 13:30:38 -05:00
Spades 50140d6ad6 Just the fix to random med item now 2016-09-04 17:32:21 -04:00
Spades a0cc7c1050 Revert "Medical related fixes"
This reverts commit d7c59520e6.
2016-09-04 17:31:48 -04:00
Spades d7c59520e6 Medical related fixes 2016-09-03 14:02:29 -04:00
Yoshax ecb2c9d5d7 Adds changelog 2016-07-12 20:33:55 +01:00
Yoshax 527b71335e Random item clean up, adjustment and addition 2016-07-12 19:55:10 +01:00
Yoshax f75d509e7f Ports event system from Bay 2016-06-01 22:05:04 +01:00
Yoshax 1237d361a5 Adjusts random tech to spawn random cable instead of always red 2016-05-28 04:42:05 +01:00
Zuhayr 8ce787ef68 Final tweaks to recipe availability and material inheritance. 2015-05-17 18:22:21 +09:30
Zuhayr a32179a062 Renamed knives. 2015-05-16 20:54:34 +09:30
Zuhayr 4cf296a6c9 First pass on custom item cleanup/refactor. 2015-05-12 10:53:16 +09:30
PsiOmega 1ae0ad6d92 Updates the atom_pool, now datum_pool, to handle any datum object.
Makes the garbage collector similarly robust. Continues the whole Destroy/qdel porting.
2015-04-24 09:59:05 +02:00
mwerezak b9d2517d83 Tweaks random gun spawners and supply packs
laser carbines and laser pistols spawn in the armoury with equal
probability.
Stunshells are now rare like they should be.
Shotgun crates now have two combat shotguns, as they are less likely to
spawn in the armoury anyways.
Weapons crate comes with laser pistols, energy weapons crate comes with
laser carbines. Seemed more consistent that way.
2015-03-09 15:47:25 -04:00
Raptor1628 cf0e526d91 Fixes and adjustments
Moves a few things around in the armory again, tasers back in lockers,
guns in officer access area of the armory. Re-adds the tacknife after it
was lost in the hydro merge, gives EMTs access to medical lockers.
2015-03-04 11:18:40 -05:00