cyberpresidentvanellope/Polaris
1
0
Fork 0
mirror of https://github.com/PolarisSS13/Polaris.git synced 2025-12-16 21:22:40 +00:00
Code Issues Packages Projects Releases Wiki Activity
27,229 Commits 5 Branches 1 Tag
00fa623c9d9119245998b51bc8d1cc8d7390aea4
Commit Graph

1926 Commits

Author SHA1 Message Date
Neerti
00fa623c9d Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into dev 
Conflicts:
	.travis.yml
	code/controllers/configuration.dm
	code/game/gamemodes/changeling/modularchangling.dm
	code/game/jobs/job/medical.dm
	code/game/jobs/job/security.dm
	code/game/machinery/Sleeper.dm
	code/game/machinery/computer/communications.dm
	code/game/machinery/cryopod.dm
	code/game/objects/items/weapons/RCD.dm
	code/game/objects/items/weapons/storage/boxes.dm
	code/game/turfs/simulated/floor.dm
	code/game/turfs/simulated/floor_types.dm
	code/global.dm
	code/modules/materials/materials.dm
	code/modules/mob/living/silicon/ai/ai.dm
	code/modules/projectiles/guns/projectile/automatic.dm
	polaris.dme
 2015-08-23 01:30:46 -04:00
Neerti
c29b47778f Adds electric lockpick power. 2015-08-23 00:58:27 -04:00
Zuhayr
edf74e4721 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into dev 
Conflicts:
	code/modules/admin/topic.dm
 2015-08-22 02:30:14 +09:30
Zuhayr
3bfa541612 Adds variables for CentComm, NanoTrasen and the station name. 2015-08-22 02:10:11 +09:30
Kelenius
bed03443d1 Merge branch 'dev' into ofClicksAndCooldowns 
Conflicts:
	code/ZAS/Airflow.dm
	code/__defines/items_clothing.dm
 2015-08-21 16:15:07 +03:00
Chinsky
317eaf4771 Merge pull request #10101 from mwerezak/shards 
Refactors obj flags and changes defined bitflag representation
 2015-08-20 19:47:58 +03:00
Neerti
ecaf6758df Begins work on new ling. 2015-08-20 11:38:48 -04:00
GinjaNinja32
03166ab4e9 Merge remote-tracking branch 'upstream/dev-freeze' into dev 2015-08-19 07:17:03 +01:00
GinjaNinja32
894b559e29 Merge remote-tracking branch 'upstream/master' into dev-freeze 2015-08-19 07:04:40 +01:00
mwerezak
fd8f6d9639 Removes MASK/HEADCOVERSMOUTH 
Code that used to check this flag now checks body_parts_covered for FACE
instead. Added a FLEXIBLEMATERIAL item flag to continue to allow vox to
eat food without poisoning themselves.
 2015-08-18 17:20:36 -04:00
mwerezak
70b74518a1 Moves BLOCKHAIR flags to flags_inv 
Moves BLOCKHAIR and BLOCKHEADHAIR flags to flags_inv
 2015-08-18 17:06:50 -04:00
mwerezak
b80c01ffbe Removes *COVERSEYES 
Removes (HEAD|MASK|GLASSES)COVERSEYES flags, in favour of using
body_parts_covered.
 2015-08-18 17:06:49 -04:00
GinjaNinja32
9f05c50a7c Merge pull request #10732 from mwerezak/skipjack3 
Fixes #10723
 2015-08-18 18:51:37 +01:00
mwerezak
b361f9ad12 Fixes #10723 2015-08-18 10:28:06 -04:00
mwerezak
7c8c42137e Fixes #10680 2015-08-18 02:54:13 -04:00
Zuhayr
a8dc3a282b Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into turfs 2015-08-18 12:06:53 -07:00
Zuhayr
0e4c2430d1 Merge branch 'dev-freeze' of https://github.com/Baystation12/Baystation12 into dev 2015-08-18 11:59:50 -07:00
Zuhayr
71214d859e Merge with master. 2015-08-18 11:31:10 -07:00
Zuhayr
5cb06f2c00 Merge pull request #10716 from mwerezak/gamemode 
Gamemode fixes
 2015-08-17 18:50:58 -07:00
mwerezak
e84f693219 Fixes certain antag roles from being unspawnable 
Fixes antag roles without certain flags from being unspawnable at round
start. Also adds more debug messages and feedback
 2015-08-17 21:11:57 -04:00
PsiOmegaDelta
74b8f6c3be Merge remote-tracking branch 'upstream/dev-freeze' into dev 
Conflicts:
	html/changelogs/.all_changelog.yml
 2015-08-17 09:44:21 +02:00
PsiOmegaDelta
55bc41241f Merge remote-tracking branch 'upstream/master' into dev-freeze 
Conflicts:
	code/setup.dm
 2015-08-17 09:37:49 +02:00
mwerezak
524548cc95 Fixes #10680 2015-08-16 14:58:27 -04:00
PsiOmegaDelta
c1eba26d8a Holo-decals and fixes. 
Adds more holodeck decals.
Allows overlays to be glued unto unsimulated turfs.
Ensures holo-stools use an existing icon state.
 2015-08-16 06:09:15 -07:00
Zuhayr
c8baafed2a Removed turf_animation for now, ported vg hasproximity optimisation. Rewrite and refactor of how turfs handle icon updates, edge smoothing and 
construction/deconstruction. Major map rework/changes.
 2015-08-16 06:05:21 -07:00
PsiOmega
c81ad0964e Merge remote-tracking branch 'upstream/dev-freeze' into dev 
Conflicts:
	code/modules/reagents/reagent_containers/food/drinks/bottle.dm
 2015-08-15 11:06:03 +02:00
PsiOmega
3a08e2884a Merge remote-tracking branch 'upstream/master' into dev-freeze 
Conflicts:
	code/game/objects/structures/crates_lockers/largecrate.dm
	code/modules/mob/living/carbon/human/life.dm
	code/modules/mob/living/silicon/ai/ai.dm
	code/modules/research/circuitprinter.dm
 2015-08-15 10:52:17 +02:00
GinjaNinja32
88433b6b98 Merge pull request #10641 from atlantiscze/kill-all-humans 
Newmalf Fixes
 2015-08-15 03:36:35 +01:00
Atlantis
e7adce2163 Better feedback 
- Attempting to hack already hacked APC now correctly produces "You already control this APC" message.
 2015-08-14 22:51:59 +02:00
PsiOmegaDelta
d5c6d9c341 Merge remote-tracking branch 'upstream/dev-freeze' into dev 2015-08-14 08:43:43 +02:00
PsiOmegaDelta
3a55b130a0 Merge remote-tracking branch 'upstream/master' into dev-freeze 
Conflicts:
	.travis.yml
	code/modules/virus2/disease2.dm
	maps/exodus-5.dmm
 2015-08-14 08:34:42 +02:00
Zuhayr
84678a91c1 Fixes roundend failing to scroll, fixes teams not getting shared global objectives. 2015-08-14 00:18:41 +09:30
PsiOmegaDelta
c63f4c62b5 Merge remote-tracking branch 'upstream/dev' into 150702-MoneyMoneyMoney 
Conflicts:
	code/__defines/mobs.dm
	code/game/jobs/job/civilian.dm
	code/game/jobs/job_controller.dm
 2015-08-13 08:06:11 +02:00
Kelenius
60196df634 Merge branch 'dev' into ofClicksAndCooldowns 
Conflicts:
	code/modules/projectiles/gun.dm
 2015-08-13 08:40:31 +03:00
PsiOmega
ba240cb768 Merge remote-tracking branch 'upstream/dev-freeze' into dev 
Conflicts:
	code/game/antagonist/station/rogue_ai.dm
	code/game/machinery/atmoalter/portable_atmospherics.dm
	code/game/machinery/spaceheater.dm
	code/modules/clothing/head/soft_caps.dm
	maps/exodus-5.dmm
 2015-08-12 21:18:18 +02:00
GinjaNinja32
5a1c80d843 Fix for non-ANTAG_OVERRIDE_JOB antags breaking with malf fix 2015-08-12 05:06:18 +01:00
GinjaNinja32
54930b69b4 Malfunction 2015-08-12 04:41:59 +01:00
GinjaNinja32
631ff21980 Merge remote-tracking branch 'upstream/dev-freeze' into dev 
Conflicts:
	code/game/gamemodes/cult/runes.dm
	code/game/objects/items/weapons/implants/implantcase.dm
	code/game/objects/items/weapons/melee/energy.dm
	code/modules/mob/living/carbon/human/emote.dm
	code/modules/mob/living/carbon/human/human.dm
	code/modules/mob/living/carbon/human/human_attackhand.dm
	code/modules/mob/living/silicon/robot/drone/drone.dm
	code/modules/mob/living/silicon/robot/emote.dm
	code/modules/mob/living/silicon/robot/robot.dm
	code/modules/nano/modules/crew_monitor.dm
	code/modules/organs/organ_internal.dm
 2015-08-11 18:47:05 +01:00
SomeoneElse
8c0984d5b1 Fix gender issues, some typos from various files 2015-08-11 13:41:40 +03:00
SomeoneElse
64c59d3145 replace \red usages with various <span> usages in runes.dm 
code/game/gamemodes/cult/rules.dm:
	replaced {\red,\b} with <span class='{danger,warning,cult}'>.
	added some span class guidelines esp. on cult for future consistency.
 2015-08-10 12:58:37 +03:00
PsiOmega
e875a7ce48 Merge remote-tracking branch 'upstream/dev-freeze' into dev 
Conflicts:
	code/game/machinery/computer3/buildandrepair.dm
	code/game/objects/items/devices/lightreplacer.dm
	code/modules/research/circuitprinter.dm
	code/modules/research/protolathe.dm
 2015-08-08 15:34:51 +02:00
PsiOmegaDelta
c560bd8d79 Merge pull request #10404 from mwerezak/stack-fix 
Material stack related fixes
 2015-08-08 09:56:25 +02:00
PsiOmegaDelta
3e266ab377 Merge remote-tracking branch 'upstream/dev-freeze' into dev 2015-08-05 09:25:53 +02:00
PsiOmegaDelta
93011f94c4 Merge pull request #10425 from Baystation12/dev-freeze 
Dev
 2015-08-04 13:07:11 +02:00
mwerezak
d25d0c700c Fixes #10403 
can_start() no longer attempts to rebuild the antag candidate lists but
instead reads the existing lists that are now built in pre_setup()

Also fixes an inverted check that was preventing antags from spawning.
 2015-08-03 20:01:55 -04:00
mwerezak
2e1607f611 Fixes #10414 
Antagonists are again drafted in attempt_spawn() and all players in the pending list will be spawned (provided they pass sanity checks).
Instead, attempt_spawn() is called in either pre_setup() or post_setup() depending on if the ANTAG_OVERRIDE_JOB flag is set. And all antags have
their spawning finalized in post_setup().

In addition, if game mode setup fails, all pending antagonist players have their special roles cleared.
 2015-08-03 12:03:08 -04:00
mwerezak
0ceb0e291d Fixes #10314 
Replaces every check for a hardcoded material stack type with a check
for material of the stack.
 2015-08-02 00:01:10 -04:00
Zuhayr
82152daa30 Merge pull request #10393 from Baystation12/dev-freeze 
Dev freeze
 2015-07-31 18:59:03 +09:30
PsiOmegaDelta
75920431e8 Merge pull request #10386 from mwerezak/antag-fix 
Fixes #10309
 2015-07-31 10:26:14 +02:00
PsiOmegaDelta
c28b3721b4 Merge remote-tracking branch 'upstream/dev-freeze' into dev 
Conflicts:
	code/_helpers/unsorted.dm
	code/modules/clothing/glasses/glasses.dm
	code/modules/mob/living/carbon/human/life.dm
	code/setup.dm
 2015-07-31 10:00:16 +02:00