Commit Graph

159 Commits

Author SHA1 Message Date
Leshana
ef3df27528 VOREStation Specific Merge Changes
* PolarisSS13/Polaris#4818 with VOREStation/VOREStation#3004
* Repath /obj/item/weapon/material/knuckledusters to /obj/item/clothing/gloves/knuckledusters
* Keep lights on explorer hoods
* Don't map in anti-xeno tasers from Polaris lore.
2018-02-17 16:56:31 -05:00
Anewbe
329a65be08 Merge pull request #4838 from VOREStation/pol-emerboxes
Port Bay's survival boxes
2018-02-17 10:05:39 -06:00
Leshana
7ed3d2c2f6 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2018-02-16
# Conflicts:
#	code/_onclick/hud/screen_objects.dm
#	code/game/objects/items/weapons/storage/storage.dm
#	code/game/objects/structures/crates_lockers/closets/secure/medical.dm
#	code/modules/admin/admin_verbs.dm
#	code/modules/clothing/clothing.dm
#	code/modules/clothing/gloves/color.dm
#	code/modules/lore_codex/codex.dm
#	code/modules/mob/living/simple_animal/aliens/alien.dm
#	code/modules/mob/living/simple_animal/animals/cat.dm
#	code/modules/mob/living/simple_animal/animals/goose.dm
#	code/modules/mob/living/simple_animal/simple_animal.dm
#	code/modules/mob/mob_defines.dm
#	code/modules/projectiles/projectile/special.dm
#	html/changelogs/.all_changelog.yml
#	maps/southern_cross/southern_cross-1.dmm
#	maps/southern_cross/southern_cross-7.dmm
#	vorestation.dme
2018-02-17 00:35:29 -05:00
Arokha Sieyes
f4d0ec3fb8 Port Bay's survival boxes
Includes some tweaks to items that usually come in the boxes to make them more similar to the Bay implementation.
2018-02-16 19:21:15 -06:00
Anewbe
7e2df51283 Changes mine code, adds random mine spawners (#4817) 2018-02-15 12:19:58 -08:00
Anewbe
51d425b1b8 THE MINI FIST-PUNCH UPDATE (#4804)
* VARIOUS FISTICUFFS RELATED CODE CHANGES
2018-02-12 23:17:35 -08: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
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
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
Woodratt
28dfb0b4b0 Southern Cross POI adjustment and Map adjustments
- DJ Station APC turned off at default
- DJ Station one general intercom replaced with a syndicate intercom
- DJ Station headset no longer guaranteed to spawn, one in four chance to spawn in one of the rooms
- DJ Station Exterior tiles (around the generator) marked as outdoor tiles
- Advanced roller beds moved to SAR lockers
- Blood cabinet and IV stand in SAR room, two o- blood bags and two empty blood bags at round start
- Mining outpost now locked to IDs with maintenance access and research access
- Observation windows in xenobio are now electrified
- Extra sinks and a high capacity water tank added to xenobio
- Red flags in the caves to designate the 'border' between the regular caves and the more dangerous ones
- Xenoresearch first aid station door name fixed
2018-01-30 03:50:55 -08:00
Leshana
27c3272821 Merge remote-tracking branch 'upstream-polaris/master' into polaris-sync-2018-01-27
# Conflicts:
#	code/ZAS/_docs.dm
#	code/__defines/mobs.dm
#	code/game/turfs/flooring/flooring_decals.dm
#	code/game/turfs/simulated/walls.dm
#	code/modules/client/preference_setup/loadout/loadout_utility.dm
#	code/modules/lore_codex/codex.dm
#	code/modules/mob/living/life.dm
#	code/modules/mob/living/living_defines.dm
#	maps/southern_cross/southern_cross-1.dmm
#	maps/southern_cross/southern_cross-3.dmm
#	maps/southern_cross/southern_cross-6.dmm
#	maps/southern_cross/southern_cross-7.dmm
#	maps/southern_cross/southern_cross_jobs.dm
#	vorestation.dme
2018-01-27 23:08:53 -05:00
Woodratt
f8394ca19a Southern Cross Pilot DLC Update
- Addition of two pilot uniforms x2 pilot helmets x2 pilot uniforms (+ webbing) x1 blue pilot jacket. Basic Teshari sprites included.
- Pilot uniforms done by ASN set as default pilot outfit. Other uniform will be in the loadout when we switch maps
- SAR get Explorer radio channel access
- More map fixes and additions. In theory skies of sif should no longer be vacuum. Oxygen required as super cold.
- Removal of Explorer pilot access due to the shuttles having autopilot now.
2018-01-23 15:42:57 -08:00
Arokha Sieyes
dc0e602663 Knife path fix for VS trashpiles and a fluff item 2018-01-18 15:48:14 -05:00
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
e650c62c6b LOTS OF FIXES 2017-10-08 18:05:27 -04:00
Cameron Lennox
15a6472d14 Pol Sync 2017-10-08 17:44:25 -04:00
Spades
07762f31e7 Some disorganizes changes by Aces
- UNSC is now USDF.
- .32 is now .380 instead.
- Added giskard to random gun spawns.
- Changed oliva to be a subtype of giskard.
- Rebalanced random gun spawner and added things.
- Detective no longer spawns with a pistol. It's in your locker instead.
- `SMG_sol` is now just `sol`.
- Fixed some ammo pathing to be consistent.
- Moves Asset Protection spawn point inside the big armory at CentCom.
- Adds a door in CentCom to let the ERT area actually be reached from
CentCom's bridge.
2017-09-21 03:22:20 -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
923e6a9677 Fixes compile errors. 2017-08-28 21:04:53 -04:00
Spades
18ffeefafd Removies oties and outdoors area 2017-08-26 15:51:37 -04:00
Spades
1ef09a64d1 Removes SVD 2017-08-08 01:17:29 -04:00
Spades
7db8de3530 MERGE 2017-08-07 16:55:50 -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
Spades
190d532f05 One last thing 2017-07-08 01:28:31 -04:00
Spades
b5f86eece2 Merge remote-tracking branch 'refs/remotes/origin/master' into wilderness-additions
# Conflicts:
#	code/modules/mob/living/simple_animal/vore/otie.dm
2017-07-08 01:26:47 -04:00
Spades
19a6895e3c Fixes 2017-07-08 01:24:55 -04:00
Spades
e19bcef832 forgot this 2017-07-07 23:39:59 -04:00
Spades
1c6e63cd51 Wilderness atmos fix (#1826)
* Atmos and mob faction fix

Should reduce lag substantially and stop planetary phoron fires.

* Active Edges

* fuck you Travis you unhelpful shit

* Testing probable problem area.

* Is THIS it?!

* Long shot, but let's try it.

* Just to kick Travis again

* oops
2017-07-07 01:09:42 -04:00
Spades
09d351aff9 oops 2017-07-04 20:09:04 -04:00
Spades
0540593119 Final additions and fixes 2017-07-04 20:01:38 -04:00
Spades
4367bc2da7 sleepy commit 2017-07-04 06:38:32 -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
Spades
2f9c8b48b4 Merge remote-tracking branch 'refs/remotes/origin/master' into guns 2017-07-02 00:30:23 -04:00
Spades
3db35eb684 Dakka Dakka
- Removed gun_vr judge, Polaris has one now.
- Removed vorestation m44 mags, Polaris has those now.
- Removed detective's .44 magnum because NO YOU CANNOT HAVE A FUCKING
MAGNUM
- Corrected inconsistent naming of .44 speedloaders
- Corrected inconsistent naming of .357 speedloaders
- Fixed broken calibers for .357 stuff to be consistent with upcoming
Polaris sync.
2017-06-30 22:42:08 -04:00
Leshana
1507a0330c Fixes ammo paths changed by PolarisSS13/Polaris/pull/3541 in VOREStation custom code. 2017-06-30 22:34:15 -04:00