cyberpresidentvanellope/Polaris
1
0
Fork 0
mirror of https://github.com/PolarisSS13/Polaris.git synced 2025-12-22 08:01:16 +00:00
Code Issues Packages Projects Releases Wiki Activity
41,509 Commits 2 Branches 1 Tag
948d43afecadc272b215ec2e8c46f30a901b5c18
Commit Graph

2490 Commits

Author SHA1 Message Date
Zuhayr
d5b904ca2a Merge branch 'master' of https://github.com/PolarisSS13/Polaris 2016-01-26 11:11:55 +10:30
Kelenius
883013db81 Fixes a roundstart runtime 2016-01-25 18:11:14 +03:00
Datraen
5b9cab5f9a Changes ling armored helmet to the proper sprite. 2016-01-24 22:33:57 -05:00
Zuhayr
e557a71fdc Merge branch 'dev-freeze' of https://github.com/Baystation12/Baystation12 2016-01-20 08:01:14 +10:30
Neerti
403fbf05ab Merge branch 'master' of https://github.com/PolarisSS13/Polaris into 12/16/2015_newwizard 2016-01-14 00:54:35 -07:00
Neerti
19603db5dc More work on new wizard. 2016-01-14 00:54:07 -07:00
Datraen
9b3c21cb05 Adds extended info to certain game modes missing extended info. 2016-01-05 21:12:35 -05:00
Datraen
0c4c3b7add Gives mods AOOC, fixes AUTOAUTOTRAITOR. 2016-01-05 18:12:56 -05:00
GinjaNinja32
7cca8416b3 Merge remote-tracking branch 'upstream/master' into dev-freeze 2015-12-25 03:41:33 +00:00
GinjaNinja32
34b8c99d52 backport fix for #10705 from dev 
fix #10705
 2015-12-25 00:56:16 +00:00
ccomp5950
ccda750ee1 AI Malf will no longer be able to spawn a non-antag AI 
fixes #10554
 2015-12-24 12:26:56 -05:00
Neerti
835b11d8ab Merge branch 'master' of https://github.com/PolarisSS13/Polaris into 12/16/2015_newwizard 2015-12-24 07:11:00 -05:00
Zuhayr
e555c8432f Merge pull request #640 from Neerti/12/21/2015_event_tweaks 
Random Event Tweaks
 2015-12-24 22:11:19 +10:30
Zuhayr
8602f07d31 Allowed grenades to be stuffed into mouths and primed. 2015-12-24 21:55:05 +10:30
Zuhayr
f93ea6a78f Tweaks to previous commits. 
More tweaks to IPC fixes.
Merge resolution/compile fixes.

Further work on properly integrating, updating and fixing prosthetic options.

Repathed internal organs to organ/internal.

More work on full synthetics, changelings, overheating.

Working on getting organs to qdel properly and spawn properly when robotized.

Finalized some overheating values, added remaining prosthetic icons.

Finalizing the testing version of the full prosthetic bodies branch.

Added suit cyclers to the autolathe and map.

Fixing runtime errors.

Fixing errors.

Changelog.

Replacing limb and organ strings with constants.

Prevented brainless species from becoming full cyborgs.

Fixed issues with brain/MMIs renaming themselves inappropriately.

Various fixes and oversights.
 2015-12-24 21:13:40 +10:30
Zuhayr
d71573e749 Further work on properly integrating, updating and fixing prosthetic options. 
WIP
Allowed heads/bodies to be prosthetic. Removed IPC. Refactored some flags.
 2015-12-24 21:10:33 +10:30
Neerti
451c477e4c Tweaks event text to fit with the lore better. 
Adds more informative text for vending machines.
Removes RNG viruses.
 2015-12-21 04:01:05 -05:00
Neerti
13b50f8f39 Adds groundwork for the new object based spell system. 2015-12-20 15:25:10 -05:00
Neerti
280844af65 Update cult_structures.dm 
Deletes the commented out code.
 2015-12-15 20:50:10 -05:00
Neerti
3752d44324 Removes ability to summon Narsie, replaced with a summon Hell rune. 
Spooky cult mobs nerfed.
Manifested people no longer count for summoning Hell.
 2015-12-15 20:36:02 -05:00
Neerti
c84260a4de Nerfs Changelings in various ways. Spacearmor is weaker. Cryosting is less potent, and there is now a three minute cooldown when using Cryostring or Delayed Toxic Sting 2015-12-15 16:08:53 -05:00
Neerti
0b5f18ab39 Removes debug world << output from holidays. 2015-12-10 00:50:42 -05:00
EmperorJon
f6cb53835c Merge pull request #429 from EmperorJon/05_Dec._Update_main_z_level_space_areas 
Updates all get_base_turf usages to get_base_turf_by_area.
 2015-12-05 04:37:35 +00:00
Jon
85c704676f Updates all get_base_turf usages to get_base_turf_by_area. 
This means that instead of the base turf being defined by the z-level, it's now defined by area and defaulted by z-level.

Updates all "shuttle" and "solar" areas to have a base_turf of space.
Updates docking arms 1, 2, and 3 on the main asteroid level to have a base_turf of space.

Other z-levels may still need updating.

This change means that all actions which destroy or dismantle a tile - for example bombs, a singularity, a shuttle leaving, or deconstruction - now leave these new areas as space not asteroid. Future mapping efforts may need to take this into account.
 2015-12-05 04:24:17 +00:00
Neerti
5333ba66af Reduces round-end timer from five to three minutes. 2015-12-03 22:34:34 -05:00
Neerti
e528bb13cb Removes references to Lesser Form, a power that no longer exists. 2015-12-03 13:26:50 -05:00
Neerti
79c5f4a1a8 Makes a line more readable. Thanks GinjaNinja32. 2015-12-02 13:22:14 -05:00
Neerti
b002a75539 Makes round-end last five minutes instead of one, with a per-minute countdown. 2015-12-02 12:32:28 -05:00
Jon
53cbd2bbe0 Alters the secret player requirements for various game modes: 
https://docs.google.com/document/d/1oCuSNmWOhNOzGk9AHmZeVhFPX9Qr0LHSqyxH7ocaXD0/edit
 2015-11-28 23:08:11 +00:00
Neerti
78e5701b5c Replaces most instances of Nyx to Vir. 2015-11-26 01:01:06 -05:00
Neerti
4da0c6b574 Removes world << output, tries to add thanksgiving on the correct date. 2015-11-25 22:19:43 -05:00
Neerti
31e3bd29cc Refactors holiday system slightly. It's now a list based system, so you can have multiple holidays on the same day, in case you wanted to do that. 
Removes the dumb Holidays.
Adds more real life and fictional holidays, and adds a blurb for all of them.
 2015-11-23 09:28:34 -05:00
Neerti
dd3ab4dac0 Finishes new ling, need better sprites but that's for another time. 2015-11-18 16:20:28 -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
b1fe5e3eab Merge remote-tracking branch 'upstream/dev-freeze' into dev 
Conflicts:
	code/game/antagonist/outsider/ert.dm
 2015-11-06 17:50:34 +01:00
PsiOmegaDelta
e81f42840a Merge remote-tracking branch 'upstream/master' into dev-freeze 
Conflicts:
	code/modules/mob/living/carbon/human/species/station/station.dm
 2015-11-06 17:43:05 +01:00
PsiOmegaDelta
20eb505c69 Adds antag datum flag that is used to exlude the type from random selection. 
Death Commando, Mercenary Commando (inherits from death commando), and the ERT antag types added to the exclude list. Fixes  #11416.
 2015-11-05 08:48:05 +01:00
Neerti
92c1c468e4 Despite the name, they're not done, because reasons. 2015-10-29 21:22:42 -04: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
0b9b8feb1e Merge remote-tracking branch 'upstream/dev-freeze' into dev 
Conflicts:
	code/game/gamemodes/malfunction/newmalf_ability_trees/tree_networking.dm
 2015-10-21 10:38:57 +02:00
PsiOmegaDelta
db833735a8 Merge pull request #11340 from Baystation12/master 
Dev-freeze.
 2015-10-21 10:36:30 +02:00
Chinsky
e5cda9ad60 Merge pull request #11332 from PsiOmegaDelta/151019-BloodUponBlood 
Limits the number of runes to one per turf.
 2015-10-21 01:56:08 +03:00
PsiOmegaDelta
b92be265ee Limits the number of runes to one per turf. 
Fixes #11248.
 2015-10-19 12:49:32 +02:00
PsiOmegaDelta
03447fb609 Malf announcement type change. 
Malf announcements are now command instead of priority announcements.
This will make them be logged by newscasters. Fixes #11325.
 2015-10-17 16:01:49 +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
Chinsky
0c474bc5a5 Merge pull request #11281 from mwerezak/autoantag 
Cleans up antag auto-spawning, adds checks for active antags
 2015-10-15 19:16:13 +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
e41131368b Compilation fixes. 2015-10-14 08:43:38 +02:00