Commit Graph

84 Commits

Author SHA1 Message Date
elgeonmb
9d056decda Adds the Zaddat Race + Modifies pressure damage calculations 2019-03-28 16:54:32 -04:00
Spades
c6c7d98a2d Merge branch 'master' into upstream-merge-5735 2019-01-14 11:20:55 -05:00
Atermonera
2df5e9fe0e Merges AI Branch into Master 2018-12-01 00:06:38 -05:00
HungryMoth
6ced431d0f Update stylesheet.dm 2018-11-10 17:16:58 -05:00
Leshana
a0de41f24f Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2018-03-15
# Conflicts:
#	README.md
#	code/__defines/mobs.dm
#	code/__defines/subsystems.dm
#	code/_helpers/global_lists.dm
#	code/controllers/subsystems/garbage.dm
#	code/controllers/subsystems/overlays.dm
#	code/datums/datacore.dm
#	code/datums/supplypacks/munitions.dm
#	code/game/machinery/suit_storage_unit.dm
#	code/game/objects/items/devices/communicator/UI.dm
#	code/game/objects/items/weapons/id cards/station_ids.dm
#	code/game/objects/random/random.dm
#	code/game/turfs/simulated/floor.dm
#	code/game/turfs/simulated/floor_icon.dm
#	code/modules/awaymissions/gateway.dm
#	code/modules/client/preferences.dm
#	code/modules/ext_scripts/python.dm
#	code/modules/mob/living/carbon/human/human.dm
#	code/modules/mob/living/carbon/human/life.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/mob/living/living.dm
#	code/modules/mob/living/living_defines.dm
#	code/modules/mob/living/simple_animal/animals/bear.dm
#	code/modules/mob/mob_helpers.dm
#	code/modules/mob/new_player/new_player.dm
#	code/modules/mob/new_player/preferences_setup.dm
#	code/modules/mob/new_player/sprite_accessories.dm
#	code/modules/organs/organ_external.dm
#	code/modules/organs/organ_icon.dm
#	code/modules/organs/robolimbs.dm
#	code/modules/reagents/reagent_containers/glass.dm
#	code/modules/reagents/reagent_containers/syringes.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-4.dmm
#	maps/southern_cross/southern_cross-6.dmm
#	vorestation.dme
2018-03-15 22:41:14 -04:00
Cerebulon
b7090d7df2 Adds Tajaran Akhani language. (#5032)
* Adds Tajaran Akhani language.
Fixes plural form of Tajaran (Tajara->Tajaran) in about 50 places.

* Gives the language a colour distinct from Siik.

* Changelog
2018-03-11 16:55:08 -05:00
Arokha Sieyes
3fe17274d2 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into aro-sync
# Conflicts:
#	code/ATMOSPHERICS/pipes.dm
#	code/game/turfs/flooring/flooring.dm
#	code/modules/clothing/clothing_accessories.dm
#	code/modules/mob/living/carbon/human/inventory.dm
#	html/changelogs/.all_changelog.yml
2018-02-27 21:27:35 -05:00
elgeonmb
8c9c99f817 Adds new languages (#4961)
* langs

* humanity first

* humanity first but for real this time

* i know how to spell good

* grumbles
2018-02-26 21:21:50 -06: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
Woodratt
ed9395e58f SC Stupid Sized Map Update
Or how Woodrat spent too long on something that was supposed to be simple.

- Addition of a Explorer Radio Channel and headsets.
- Explorers and Search and Rescue job slots added
- Adjustments to the pilot job including getting rid of the flatcap
- Map fixes, adjustments, (including signs pointing to cryo) planetside side map additions splitting up of the wilderness into two area sections
- Disabled lighting on the arrivals shuttle area once it is docked with the station, should help with the whole issue of lighting bugging out and having dark space
- Fixed EMS jacket missing icons
- Fixed Research signs being missing for some reason, addition of directional signs for cryo
- Addition of a Search and Rescue Winter coat
- Probably a dozen other small bug fixes I forgot, and bug additions

Tested, seems fine. At least in short tests.
2017-12-24 07:04:34 -08:00
killer653
da0bf3743b Polaris sync 2017-11-17 19:27:03 -05:00
Anewbe
401e23daf1 Makes it pink 2017-11-06 19:09:11 -06:00
killer653
0c480ec15f Polaris sync 2017-10-27 15:30:24 -04:00
Mechoid
920e823a46 Fuel-Rod Gun, Minor fixes related. (#4103)
* A whole load of things.

* Fixes the SM Rod's travel distance.
2017-10-19 15:07:52 -05:00
Cameron Lennox
15a6472d14 Pol Sync 2017-10-08 17:44:25 -04:00
Anewbe
f856755c55 Merge pull request #3892 from MisterLayne/9/19/2017_SkrellLangColorChange
Skrell Language Color Change-
2017-09-24 00:48:14 -05:00
killer653
2755d3ddb1 HOTFIX 2017-09-21 20:26:48 -04:00
MisterLayne
5580d29ae6 Changes Skrell Color Language 2017-09-19 21:00:44 -04:00
Anewbe
d0d840082a Adds an event_manager chat channel 2017-09-17 19:48:51 -05:00
Leshana
18b1828631 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-20170630 2017-06-30 22:31:43 -04:00
Neerti
1cfd2f08f2 Adds AOOC functionality for antags.
AOOC can be granted on a per-antag type basis.  If the type has can_use_aooc equal to true, they can both use and see AOOC.  It is true by default to allow for the upcoming Infiltrator type to automatically be able to use it.
The types disallowed from AOOC are ERT, Traders, and Renegades.  This means admins can now use AOOC to talk to the real antags and not the ERT.
2017-06-24 12:31:18 -04:00
Yoshax
5a341ff38e Fixes a bug with some languages 2017-03-31 17:52:15 +01:00
Arokha Sieyes
9a8b0911c6 Angel and Demon languages
Not actually MAGICAL angels and demons, I believe, just they resemble them and are spacefaring races and so sometimes end up matching various religious texts in terms of appearance and habit.

Can we please stop adding whitelisted languages? It's dumb. We have ONE person whitelisted for gutter, and a lot of good it does them since nobody else has even applied. They'd have to talk to someone with a translator.
2017-03-13 12:45:03 -04:00
killer653
7d9d970a2e For some reason this didn't get pushed 2017-02-01 15:11:06 -05:00
Anewbe
d53cfc4773 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into theUnboxingBegins
# Conflicts:
#	code/modules/mob/new_player/sprite_accessories.dm
#	code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Toxins.dm
#	icons/mob/human_face.dmi
#	icons/mob/suit.dmi
2017-01-17 22:05:38 -06:00
killer653
832418c7c9 Polaris sync 2017-01-15 18:12:15 -05:00
Neerti
f393dafa5d Ports Bay's Journalist TV Drone
Also ports prerequisite entertainment radio frequency code.
2017-01-09 05:03:40 -05:00
Anewbe
2c86a0a465 Returns the Vox, who now breath Phoron 2017-01-06 17:49:39 -06:00
Poojawa
4ec6aab681 Vulpkanin
Ported from Paradise, should be a bit better than the old fox sprites
taken from Citadel.
2016-05-23 16:08:01 -05:00
Arokha Sieyes
6f5ed58520 Language css 2016-05-10 22:27:03 -04:00
Zuhayr
a628ae2a56 Removed the Vox Pox. 2016-02-20 11:24:19 +10:30
mwerezak
a560acd3da Makes reflex shooting more obvious
Reflex shooting now has a different colour than regular shooting, to prevent mixups
2015-04-02 21:54:35 -04:00
mwerezak
32ee4d57dd Improves cult conversion
Now uses a continuous damage system, dealing damage once every 100 ticks (~10 seconds).
Also improves effects dealt when resisting conversion.
2015-03-05 23:58:56 -05:00
Amunak
f5370f0c5e Update stylesheet.dm 2015-01-25 22:31:25 +01:00
Amunak
c34a8ee859 Admin name colour msay colour fix
Admin name colour in msay now matches their default OOC colour. Hopefully fixes some concerns presented in #7657.
2015-01-05 18:40:52 +01:00
Amunak
e5512518bb Makes LOOC dark turquoise, fixes #7681 2015-01-05 13:48:22 +01:00
mwerezak
6cf010f737 Converts \green macro to span tag 2014-12-28 02:06:02 -05:00
Zuhayr
3de0562dbe Merge resolution. 2014-12-22 23:28:27 +10:30
Amunak
6c1911c34e Makes 'other' PM colour way darker. 2014-12-14 17:03:54 +01:00
Amunak
1fb9c76101 Makes admin log messages bold again. 2014-12-14 16:51:59 +01:00
Amunak
b710e70046 Makes asay purple again. 2014-12-14 16:51:33 +01:00
Amunak
e348e8e031 Reverts admin log colour. 2014-12-14 16:46:47 +01:00
Zuhayr
a79886ec59 Added icons to species select window, changed Sol Common to blue. 2014-12-13 23:55:06 +10:30
Zuhayr
7a3b2b3593 Reverted colours to previous iteration. 2014-12-11 14:20:41 +10:30
Amunak
82322f146e Admin PM cleanup; moved styles to stylesheet.dm, added chattags 2014-11-28 12:05:11 +01:00
Amunak
9e40851998 Moved formatting of admin and mod say channels to stylesheet + added chattags
This actually removes some stuff from asay and msay. The only place where admins and mods(/mentors/whatever) are distinct now is msay, and only in name: admins have their nick colored like their OOC chat (though this can be changed in stylesheet.dm). Also added the feedback thingy proc call and did some code cleanup.
2014-11-28 12:02:04 +01:00
Amunak
6d8818f801 Changed radio colors in attempt to follow a color pallete while keeping readability.
Also moved stuff around, tried to 'section' the bloody thing.
2014-11-28 10:37:52 +01:00
Amunak
faf9d34895 Renamed the .admin class to .log_message, which better describes its purpose 2014-11-28 10:26:10 +01:00
Amunak
caf153ca61 Rewrite of LOOC code
LOOC now uses stylesheet.
It is less messy (there is now only one loop)
Added shortcut for admins to jump to mob
2014-11-26 04:17:19 +01:00
Amunak
5a65c85cb0 Moved OOC color definitions to stylesheet:
Removes the unused (and abused) set-player-OOC-colour verb.
Adds definitions for each rank to the stylesheet, moving it from the OOC file.
Updates the OOC-text-color verb accordingly.
Made the custom OOC text color resetable.
Cleaned up hardcoded values, old code and comments.
2014-11-26 04:04:32 +01:00