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
Cyantime
d64bf6fd7e
Shrinks pocket newscaster
2018-02-16 02:23:58 -05:00
elgeonmb
7b7a15f26f
Feb 11 News ( #4803 )
...
* Feb 11 News
* woops
* woops 2 electric boogaloo
2018-02-12 14:17:18 -06: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
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
elgeonmb
00ed88764f
2/3/18 news update ( #4713 )
...
* adds an e-reader full of news to the loadout
* Political Almanac -> Pocket Newscaster
* news update
2018-02-04 18:15:42 -06: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
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
elgeonmb
3d5740c909
adds an e-reader full of news to the loadout ( #4619 )
...
* adds an e-reader full of news to the loadout
* Political Almanac -> Pocket Newscaster
2018-01-25 18:18:35 -06:00
killer653
0c480ec15f
Polaris sync
2017-10-27 15:30:24 -04:00
Anewbe
9295a9813e
Adds the Promethean loreblurb
2017-10-22 19:14:34 -05:00
Anewbe
04c393a953
Adds the Vatborn lore blurb, fixes some things.
2017-10-19 10:28:34 -05:00
killer653
1bb71ef429
Polaris Sync
2017-10-16 22:16:24 -04:00
Anewbe
f42457b997
Starts work on the Vatborn Human species
2017-10-15 23:26:22 -05:00
Neerti
1f0bb5891c
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into 9/28/2017_web_shuttles
...
# Conflicts resolved:
# code/modules/busy_space/organizations.dm
2017-10-10 01:19:53 -04:00
Neerti
7225ea2b66
Read github PR for details.
2017-10-10 00:48:27 -04:00
killer653
fa1170c7e8
Should fix all the corp regs & codex issues
2017-10-09 23:42:08 -04: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
Anewbe
0de6cddef5
Activates Neerti's Lawbook
2017-10-03 22:29:50 -05:00
Spades
a55d4c5e4c
Imperial Military Update
...
Adds Imperial stuff for our space elf romans.
2017-09-02 04:07:25 -04:00
Spades
c8f716bd2d
Lore tweaks
2017-09-01 23:41:08 -04:00
Spades
4367bc2da7
sleepy commit
2017-07-04 06:38:32 -04:00
Arokha Sieyes
4aa8df4171
Merge pull request #1430 from VOREStation/aro-announcer
...
Update Codex to have our lore
2017-04-25 19:08:43 -04:00
Arokha Sieyes
6a98b982a7
Update Codex to have our lore
...
Updates the lore in the Codex books to be accurate to our lore, and invented a bunch of extra lore on the spot to make it make sense. Seems fine to meeeeeeee.
2017-04-25 18:59:05 -04:00
Anewbe
bf7dce79cc
Unathi mechanical changes ( #3256 )
...
* Unathi changes
* Tweaks blurb
* Alcohol tweaks
* Age tweak
* Slowdown
* Adds Unathi to the codex
* Fixes Unathi Organs, adds sprites
* Fixed the changelog
* Sprite and language tweaks, Unathi
2017-04-19 13:42:51 -04:00
Neerti
a4a05ae4ec
Implements the new Codex.
2017-04-08 12:08:08 -04:00
