133 Commits

Author SHA1 Message Date
Mack d0cdeac26b Add files via upload 2019-04-19 23:42:29 -04:00
Mack 866ea08b11 Update catalog.dm 2019-04-19 23:10:27 -04:00
Mack 834998b250 Fixing lack of trainee 2019-04-19 23:04:02 -04:00
Mack 947b139451 Fixing Training Redundancy 2019-04-19 17:08:19 -04:00
Mack 2ee3915cf6 Trainee Catalog 2019-04-19 17:07:44 -04:00
Mack 8f1b2823e1 Two new catalogs. Trainee and Admeme 2019-04-19 16:00:00 -04:00
Mack 8dd363f7ff The Monocoole 2019-04-17 23:35:52 -04:00
Mack 62caf92c05 Teshari can use The Fast now 2019-04-17 23:13:17 -04:00
Mack 574254fdf5 The Fast 2019-04-17 23:11:24 -04:00
Mack 0aa3bf682b Adding in Trainee and Admeme cores.
Both are unable to get from the book. Trainee is the one for the station crew in the event, Admeme is what the Traders are going to have
2019-04-17 23:06:47 -04:00
AnonymousHybi bff9f560f7 Replaced all blue font with a custom colour 2019-01-18 15:14:32 +00:00
Jon 27c9225728 Also enables NIFs 2018-12-22 14:26:02 +00:00
Jon 727c2aef57 Dark theme initial commit 2018-12-15 05:12:06 +00:00
Leshana b5cf8383f6 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into vplk-sync-2018-04-14
# Conflicts:
#	code/game/machinery/jukebox.dm
#	code/modules/economy/lorenews.dm
#	code/modules/mob/living/carbon/human/update_icons.dm
2018-04-15 14:19:36 -04:00
Mechoid 57ab0e715b Constructs 2.0 - Living Stone (#5040)
* Construct Overhaul + Related Fixes/Tweaks
2018-04-04 23:45:00 -07:00
Leshana 30454ccdc3 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2018-02-23
# Conflicts:
#	code/game/jobs/job_controller.dm
#	code/game/machinery/oxygen_pump.dm
#	code/game/objects/items/weapons/storage/firstaid.dm
#	code/game/objects/structures/crates_lockers/closets/secure/security.dm
#	code/modules/mob/new_player/new_player.dm
#	code/modules/organs/internal/eyes.dm
#	html/changelogs/.all_changelog.yml
#	maps/southern_cross/southern_cross-1.dmm
#	vorestation.dme
2018-02-23 21:55:42 -05:00
Anewbe 8c5dc66a13 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into steals_more_armor 2018-02-21 23:33:17 -06:00
Anewbe 6446328d09 Slimes should no longer /list you. 2018-02-20 01:58:49 -06:00
Anewbe 5c9fd04ed3 Fixes some goofs 2018-02-17 01:19:57 -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
Anewbe 1593e4fdeb Steals more modular armor code 2018-02-16 18:41:07 -06:00
Anewbe 534a588a6a Gun changes (#4185)
* Various background gun changes

* Forgot to include the sounds, woops

* Fixes some more gun stuff

* Makes the cham gun work again
2018-02-12 23:12:14 -08:00
Anewbe 2eac03ec08 Adjusts certain simple mobs, adds some things (#4778) 2018-02-10 23:31:03 -08: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
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
Arokha Sieyes ff228754b3 Merge polaris sync 01 17 2018
Planes, layers, human/update_icon()
2018-01-17 17:56:51 -05:00
Leshana 5d5f052eb7 Merge remote-tracking branch 'polaris-upstream/master' commit '613c5984eeeed2757fe7f15877973f81f526323c' into polaris-sync-2018-01-10
# Conflicts:
#	code/game/machinery/atmoalter/area_atmos_computer.dm
2018-01-15 13:27:39 -05:00
Neerti d0d6689263 Web Shuttle Update
Adds autopilot functionality for shuttle one and shuttle two. It can be enabled and disabled by the flight computer.
Autopilot is active by default on both shuttles. The shuttle waits for two minutes when it reaches the outpost or station, except for the first flight, where it waits for about ten minutes, which should be plenty of time for people to get on and for the pilot to turn it off if one exists.
Adds renaming feature to all shuttles.
Ports /tg/'s 'shuttle warning' effect, which adds a bunch of blue circles where a ship is about to land, which should prevent surprise shuttle crushes if paying attention.
Flight times for all routes are cut in half to act as the bonus for flying manually. Automatic flight takes twice as long, and so it will take the current amount of time.
Makes Ninja shuttle faster because Nippen steal.
Does some cleanup with temporary effects.
2018-01-14 14:03:58 -05:00
Cyantime 36f8c56537 Fixes 'varient' 2018-01-08 16:42:20 -05:00
Leshana 28c193cbdb Merge remote-tracking branch 'refs/remotes/polaris-upstream/master' into polaris-sync-2018-01-04
# Conflicts:
#       code/game/objects/items/devices/communicator/communicator.dm
#       code/modules/client/preference_setup/occupation/occupation.dm
#       code/modules/mob/living/simple_animal/animals/cat.dm
#       code/modules/mob/mob_helpers.dm
#       code/unit_tests/zas_tests.dm
#       maps/southern_cross/southern_cross-1.dmm
#       maps/southern_cross/southern_cross-3.dmm
#       maps/southern_cross/southern_cross-6.dmm
#       vorestation.dme
2018-01-04 22:44:04 -05:00
Leshana 064f2fe9ca Additional types which need Destroy to return qdel hints (and other Destroy fixes) 2017-12-30 16:02:27 -05:00
killer653 3a2093ef40 Polaris sync 2017-12-21 04:01:07 -05:00
Neerti 7497aef295 work 2017-11-26 12:08:05 -05:00
killer653 315711b314 Pol sync part 2 2017-10-27 15:30:51 -04:00
killer653 0c480ec15f Polaris sync 2017-10-27 15:30:24 -04:00
Neerti bdbbab4650 Merge pull request #4133 from Anewbe/firestorm
Rebalances Firestorm
2017-10-23 02:44:51 -04:00
Anewbe a0ed4365f0 Rebalances Firestorm 2017-10-21 13:58:19 -05:00
Neerti 1aff3fc8c0 Syndicate Borgs II, Return of the Salt
Adds an option in mercenary uplinks to purchase three different 'classes' of drones.
See PR for more details.
2017-10-20 13:01:45 -04:00
killer653 1bb71ef429 Polaris Sync 2017-10-16 22:16:24 -04:00
Anewbe 3c2831e5d9 Adds rings 2017-10-15 15:05:52 -05:00
Neerti 92b72cfbed Merge branch 'master' of https://github.com/PolarisSS13/Polaris into 9/30/2017_golems_and_animals 2017-10-10 01:21:39 -04:00
Cameron Lennox 15a6472d14 Pol Sync 2017-10-08 17:44:25 -04:00
Anewbe e2e1493112 Makes the boots of speed slower, and boots. 2017-10-01 12:11:16 -05:00
Neerti b8a7749351 Technomancer Golem Tweaks & Simple Animal Health "Refactor"
Simple animals now use the base health system that most other mobs use.
Fixes a bunch of Destroy()s so that they should qdel properly.
Mend Synthetic can heal synthetic simple animals.
Adds attack and spellcast animations to the golem.
Adds system to manually flick because byond is stupid sometimes.
Removes shield and reflect spells from the golem since SAs can't use shields at the moment.
Adds more helpful spells to the golem.
Golem and the Lost Drone now use the 'synthetic_evil' speech bubble.
2017-09-30 22:24:42 -04:00
Anewbe e51e80db99 Improves the tesla and shield generator armors 2017-09-24 19:21:23 -05:00
Anewbe c80b535a29 Merge pull request #3902 from Neerti/9/19/2017_lost_drone
Adds the Lost Drone
2017-09-22 15:24:05 -05:00
Neerti afd7b15442 Adds the Lost Drone 2017-09-22 01:17:53 -04:00
killer653 2755d3ddb1 HOTFIX 2017-09-21 20:26:48 -04:00
Anewbe d279c188c9 Adds the enchancement_desc 2017-09-20 13:10:06 -05:00
Anewbe a8c9b61b75 Condensation can now freeze floors, if you have the scepter. 2017-09-18 16:34:21 -05:00