cyberpresidentvanellope/Polaris
1
0
Fork 0
mirror of https://github.com/PolarisSS13/Polaris.git synced 2025-12-26 01:52:29 +00:00
Code Issues Packages Projects Releases Wiki Activity
28,454 Commits 2 Branches 1 Tag
1a94dea2ea53b535965a2919bcf6b622fb9cb2db
Commit Graph

750 Commits

Author SHA1 Message Date
Neerti
3ebd27eece Forgot to commit this. 2015-11-22 22:03:50 -05:00
PsiOmegaDelta
d709363ff7 Radio NanoUI. 
Ports the radio NanoUI interface from Paradise with some Bay-adjustments.
Based on the latest revision https://github.com/ParadiseSS13/Paradise/pull/2369.
 2015-11-22 21:42:54 -05:00
PsiOmegaDelta
3eae0d5101 Destroy tweaks. 
Ports Destroy() proc tweaks from Paradise and /tg/, sourced from https://github.com/ParadiseSS13/Paradise/pull/2091.
Adds returns in Destroy()s, to prepare for future return values.
 2015-11-22 21:42:27 -05:00
PsiOmegaDelta
2200bfe436 Map tweaks. 
Adds a couple of decals to the Thunderdome.
Rotates sleepers/scanners on z-level 1 and 2. Had already done so for z-level 5. Fixes #11058.
Full tile windows no longer appear to exist? Replaces the glass on the toxin test site with reinforced glass spawners.
 2015-11-22 21:41:41 -05:00
PsiOmega
5047ea8267 Observers can now view radio settings, admins can alter them. 
Conflicts:
	code/game/objects/items/devices/radio/headset.dm
 2015-11-22 21:40:59 -05:00
PsiOmega
5bf7158c9d Non-headset/borg radios now all allow access to department channels. Headset and borg radios still rely on their encryption keys. 
Conflicts:
	html/changelogs/PsiOmegaDelta-Radio.yml
 2015-11-22 21:37:21 -05:00
PsiOmega
1bd40cf8aa Makes the cyborg radio menu more consistent. 2015-11-22 21:36:18 -05:00
PsiOmega
42342bedcb Rotates and otherwise cleans up map intercom usage. 
Conflicts:
	code/controllers/communications.dm
 2015-11-22 21:35:36 -05:00
PsiOmega
92afc566bb Makes it possible to select department channels on intercoms. 
Conflicts:
	code/game/objects/items/devices/radio/intercom.dm
	code/game/objects/items/devices/radio/radio.dm
 2015-11-22 21:34:13 -05:00
Neerti
4f77afece1 Revert 58ef59734f 2015-11-08 10:09:14 -05:00
Neerti
45f15930a0 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into 11/6/2015_neerti_breaks_everything_bay_merge 
Conflicts:
	.travis.yml
	code/_helpers/lists.dm
	code/game/objects/structures/crates_lockers/closets/secure/engineering.dm
	code/global.dm
	code/modules/client/preferences.dm
	code/modules/client/preferences_savefile.dm
	code/modules/reagents/dispenser/dispenser2.dm
	polaris.dme
 2015-11-06 17:41:18 -05:00
PsiOmegaDelta
7d4f51be8e Merge pull request #10287 from mwerezak/attack-cleanup2 
Refactors item attack click and mob melee attack handling code
 2015-10-25 08:43:47 +01:00
PsiOmegaDelta
0c3b6c01e2 Radio NanoUI. 
Ports the radio NanoUI interface from Paradise with some Bay-adjustments.
Based on the latest revision https://github.com/ParadiseSS13/Paradise/pull/2369.
 2015-10-16 16:01:36 +02:00
PsiOmegaDelta
299ad9580c Merge remote-tracking branch 'upstream/dev-freeze' into dev 
Conflicts:
	code/modules/admin/admin.dm
	code/modules/admin/topic.dm
 2015-10-16 13:02:59 +02:00
PsiOmegaDelta
fc4c1d6af7 Merge remote-tracking branch 'upstream/master' into dev-freeze 
Conflicts:
	code/game/objects/items/weapons/storage/boxes.dm
	code/game/objects/items/weapons/storage/storage.dm
 2015-10-16 11:04:43 +02:00
ccomp5950
bb93245ccd Fixes the tapping messages check. 
The check is now in Topic() instead of being based on the href link sent.

Resolves #11039
 2015-10-15 21:11:06 -04:00
Chinsky
2a88b4d0aa Merge pull request #11219 from PsiOmegaDelta/150929-HumanoidVision 
Overhauls humanoid vision handling.
 2015-10-15 19:15:28 +03:00
mwerezak
07881e7495 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into attack-cleanup2 
Conflicts:
	code/modules/mob/living/carbon/human/species/xenomorphs/alien_facehugger.dm
 2015-10-15 07:08:16 -04:00
PsiOmegaDelta
27feb09a31 Merge remote-tracking branch 'upstream/dev-freeze' into dev 
Conflicts:
	code/game/machinery/computer/computer.dm
	html/changelogs/.all_changelog.yml
 2015-10-11 17:37:01 +02:00
PsiOmegaDelta
070ca0adea Merge remote-tracking branch 'upstream/master' into dev-freeze 
Conflicts:
	code/game/objects/items/weapons/tanks/tanks.dm
	code/modules/holodeck/HolodeckControl.dm
	code/modules/mob/living/carbon/breathe.dm
	code/modules/mob/living/carbon/human/life.dm
	code/setup.dm
 2015-10-11 17:17:41 +02:00
Neerti
24d9545790 Headset/shield issues. 2015-10-11 00:54:01 -04:00
Mark9013100
fb1134a24b Changes several helmets, fixes shields 
Conflicts:
	code/game/objects/items/devices/radio/headset.dm
	code/game/objects/items/weapons/shields.dm
	code/modules/clothing/head/helmet.dm
	icons/mob/head.dmi
	icons/obj/clothing/hats.dmi
 2015-10-11 00:39:38 -04:00
Mark9013100
1eab12fc26 Two minor edits to ERT equipment 2015-10-11 00:30:10 -04:00
HarpyEagle
fa661f998f TTV Refactor 
Ensures TTV icon update occurs properly and removes the need for sleep() by
updating tank Destroy() to account for TTVs. Collects duplicated code into
a transfer_valve/remove_tank() proc.
 2015-10-08 23:26:05 -04:00
Hubblenaut
a7cad04264 Amendments to light replacer and janitor supply crate 2015-10-06 19:59:56 +02:00
HarpyEagle
7f066065d3 Merge remote-tracking branch 'upstream/dev' into attack-cleanup2 
Conflicts:
	code/modules/mob/living/simple_animal/friendly/spiderbot.dm
	code/modules/mob/living/simple_animal/simple_animal.dm
 2015-10-05 19:20:33 -04:00
PsiOmegaDelta
f3175becc0 Overhauls humanoid vision handling. 
Clothes now have a flash protection and tint level. If one is wearing multiple items with these modifiers they do stack.
Glasses also have a number of additional additions such as sight flags, see_invis level, and so forth.

Flash protection comes in 4 levels: Reduced, none, moderate, major.
Reduced protection, for example, means the user takes increased damaged from welding.
Moderate protection safeguards mobs from flashes, flash grenades, projectors, etc.
Major protection protects from the above as well as welding.

Tint also comes in 4 levels: None, moderate, heavy, blind
Moderate tint will apply the nearsighted overlay.
Major tint will apply the welding overlay.
Blind will apply the blindness overlay.

The end result is an attempt of less type checking. Any set of glasses may now also contain HUD glasses.
This should make a future rewrite of HUD glasses easier (could have the HUD functionality be a datum rather than separate item).
 2015-10-05 08:48:47 +02:00
PsiOmegaDelta
9dd1a54191 Destroy tweaks. 
Ports Destroy() proc tweaks from Paradise and /tg/, sourced from https://github.com/ParadiseSS13/Paradise/pull/2091.
Adds returns in Destroy()s, to prepare for future return values.
 2015-09-25 10:44:23 +02:00
PsiOmegaDelta
8a1b414e28 Floor painter, turf, and decal tweaks. 
Makes several custom color definitions, utilized by the floor painter, floor tiles, decals, etc.
Colored floor turfs now use a white icon state and applies a color, similar to the corresponding decals. This ensures they have the same color tone (was slightly off previously).
Colored floor tiles also use a white icon state and color application.
Removes now unused item states.
 2015-09-21 15:14:13 +02:00
PsiOmegaDelta
7d975aa36f Map tweaks. 
Adds a couple of decals to the Thunderdome.
Rotates sleepers/scanners on z-level 1 and 2. Had already done so for z-level 5. Fixes #11058.
Full tile windows no longer appear to exist? Replaces the glass on the toxin test site with reinforced glass spawners.
 2015-09-20 17:59:57 +02:00
mwerezak
26f1d02bda Merge remote-tracking branch 'upstream/dev' into attack-cleanup2 
Conflicts:
	code/modules/mob/living/carbon/human/human_defense.dm
	code/modules/reagents/reagent_containers/food/drinks/bottle.dm
 2015-09-11 18:13:14 -04:00
PsiOmegaDelta
a7fa8cde49 Merge remote-tracking branch 'upstream/dev-freeze' into dev 
Conflicts:
	code/modules/clothing/spacesuits/void/merc.dm
	code/modules/mob/living/living.dm
	code/modules/mob/living/simple_animal/borer/borer_captive.dm
	code/modules/mob/mob_grab_specials.dm
	code/modules/reagents/reagent_containers/food/drinks/bottle.dm
	html/changelogs/.all_changelog.yml
 2015-09-11 08:54:03 +02:00
PsiOmegaDelta
0b433eb90c Code relocation. 2015-09-11 08:45:49 +02:00
PsiOmegaDelta
f81ac77884 Merge remote-tracking branch 'upstream/master' into dev-freeze 
Conflicts:
	code/modules/mining/abandonedcrates.dm
	code/modules/mob/living/silicon/ai/ai.dm
 2015-09-11 08:38:28 +02:00
Vivalas
ae5810d6ed Fixes #10729 2015-09-10 13:50:24 -05:00
mwerezak
f69c723d40 Made flares a bit brighter 2015-09-09 20:42:40 -04:00
mwerezak
af52b475ff Fixes missing cooldowns, missing cult blade sound. 2015-09-09 15:15:43 -04:00
PsiOmegaDelta
cbd621ae41 Merge remote-tracking branch 'upstream/dev' into 150907-UplinkUses 2015-09-09 08:18:26 +02:00
mwerezak
068d02c28c Refactors various item attack() implementations 
Replaced some attack() overrides with apply_hit_effect() or other attack
procs where appropriate.
Removed the attack() override from reagent_containers.
 2015-09-08 23:39:33 -04:00
PsiOmegaDelta
6a956d0d0a Uplink fixes. 
Adds a default welcome message. Was lost in a game mode cleanup.
Traitors should now have telecrystals again. Also lost in the game mode cleanup.
Uplinks without correctly defined owners are now also printed in the round end summary.
 2015-09-08 08:43:40 +02:00
PsiOmegaDelta
94b4c483ba Merge remote-tracking branch 'upstream/dev-freeze' into dev 2015-09-08 08:22:37 +02:00
PsiOmegaDelta
ec7e2491be Updates "on merge" entries. Relocates code. 2015-09-08 08:03:14 +02:00
PsiOmega
0e2f44e3ac Admin logs bought uplink items. 2015-09-07 20:02:43 +02:00
Zuhayr
0c56bdd448 Merge pull request #10266 from PsiOmegaDelta/150722-TagPairs 
Makes it possible to define multiple tag pairs for the Travis check.
 2015-09-07 13:57:09 +09:30
Zuhayr
fca95039bf Merge branch 'dev-freeze' of https://github.com/Baystation12/Baystation12 into dev 
Conflicts:
	code/game/gamemodes/intercept_report.dm
	code/game/gamemodes/traitor/traitor.dm
	code/global.dm
	code/modules/mob/inventory.dm
	code/modules/mob/living/living.dm
	html/changelogs/.all_changelog.yml
 2015-09-07 11:31:19 +09:30
Zuhayr
b9c01bf2f2 Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev-freeze 
Conflicts:
	code/game/objects/items/devices/uplink.dm
 2015-09-07 11:17:06 +09:30
Chinsky
2563821832 Merge pull request #10972 from Zuhayr/resomi 
Adds the Resomi.
 2015-09-06 13:09:34 +03:00
PsiOmega
cc960624b9 Fixes mercenary mode not listing bought items. 
The mercenary leader now spawns with the uplink, as is set as its owner.
 2015-09-06 10:43:09 +02:00
Chinsky
71d1853ede Merge pull request #10993 from Zuhayr/species 
Human subspecies.
 2015-09-06 04:25:21 +03:00
Zuhayr
2b2e27d380 Species flash cleanup. 2015-09-06 10:09:03 +09:30