cyberpresidentvanellope/Polaris
1
0
Fork 0
mirror of https://github.com/PolarisSS13/Polaris.git synced 2025-12-21 15:42:53 +00:00
Code Issues Packages Projects Releases Wiki Activity
30,372 Commits 2 Branches 1 Tag
24f7c0ca2cac15f9aa55e32b50ec4162d563dfb3
Commit Graph

22674 Commits

Author SHA1 Message Date
Zuhayr
9df402b0de Fixes issues with burn repair surgery for robolimbs. 2015-12-25 08:50:58 +10:30
Sebastian Broberg
ebef6272b9 Fixes #11711 
Should fix it.
 2015-12-24 23:02:37 +01:00
PsiOmegaDelta
b0aa56089e Fixes #11745. 2015-12-24 19:11:32 +01:00
PsiOmegaDelta
6617ab6bf9 Merge pull request #11744 from Ccomp5950/fix_ai_malf_dualism 
AI Malf will no longer be able to spawn a non-antag AI
 2015-12-24 19:10:34 +01: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
GinjaNinja32
9dee0707e8 Merge remote-tracking branch 'polaris/master' into pl-chemistry 2015-12-24 15:06:16 +00:00
Neerti
084ba448fa Merge pull request #652 from Zuhayr/nerf 
Added Nerf weapons to Cargo.
 2015-12-24 06:47:48 -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
5313c6b67b Added Nerf weapons to Cargo. Codersprites. 2015-12-24 22:05:10 +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
NullSnapshot
87afd2feb2 Fixes: #11351 #11357 #11359 #11361 2015-12-24 21:10:41 +10:30
NullSnapshot
4a92b5ee70 Fixes #11350 2015-12-24 21:10:41 +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
GinjaNinja32
0bd51d2712 make vote window closeable via normal means 2015-12-24 05:28:18 +00:00
Sebastian Broberg
90f27ca42c Fixes chemgrenades 
Fixes #11686
 2015-12-23 23:46:53 +01:00
Zuhayr
53b2c6be80 Merge pull request #11737 from PsiOmegaDelta/151223-Paralysis 
Adds a paralyze button for easier administration
 2015-12-23 23:28:37 +10:30
PsiOmegaDelta
70b84d87a6 Tweaks permission rights. 2015-12-23 13:01:03 +01:00
Datraen
65f68602e7 Adds a longer timer to paralyze, allows for other mobs to fall under this proc. 
Conflicts:
	code/modules/admin/admin.dm
 2015-12-23 12:57:43 +01:00
Datraen
c5912b988c Adds a paralyze button for easy administration. 
Conflicts:
	code/modules/admin/admin.dm
 2015-12-23 12:56:48 +01:00
PsiOmegaDelta
f54dd94a66 Merge pull request #11735 from Baystation12/master 
Dev-freeze
 2015-12-23 11:33:35 +01:00
Neerti
650396af6f Merge pull request #648 from Datraen/Respawn-Time-Change 
Respawn time change
 2015-12-23 02:59:59 -05:00
woodratt
30acc6de7e 1.3.7. Fixes and Adjustments 
- Rough fix in place for the holodeck thunder dome.
- Jukebox added to the coffee shop and bar.
- Latex gloves added to Xenoflora.
- Insulated gloves added to Engineering Outpost.
- Connected the main airlocks on the mining and research outposts to the distro.
- Changes 'Vir Regional Spaceport' to ' Vir Interstellar Spaceport'
- Fixed another name issue in reference to crew transfer shuttle.
 2015-12-22 22:51:36 -08:00
Atlantis
9fa1513647 Fixes AI's Examine() 
- Message about AI's backup power now only show when the AI still lacks external power.
 2015-12-23 00:57:54 +01:00
Datraen
0b4ed44ce4 Fixes admin verb, also adds changelog. 2015-12-22 15:09:28 -05:00
Datraen
e443ffd06a Changes time to respawn down to 15 minutes. 2015-12-22 15:04:23 -05:00
Neerti
51552a8bdd Clarification on mercenary shuttle approaching message, and fixes typo on text when the drone event ends. 2015-12-22 05:03:57 -05:00
Neerti
f053e91534 Merge pull request #641 from Mark9013100/12/21/2015blackscrubhat 
Adds the black scrub cap
 2015-12-22 05:00:16 -05:00
PsiOmegaDelta
d7eaed8c67 Span correction. 2015-12-22 10:59:33 +01:00
PsiOmegaDelta
3cf0a0e182 Merge remote-tracking branch 'upstream/master' into dev-freeze 
Conflicts:
	code/modules/mob/living/carbon/human/life.dm
 2015-12-22 10:46:55 +01:00
Zuhayr
407ec5645d Merge pull request #563 from Sabess/master 
Adds Brass Knuckles
 2015-12-22 14:15:22 +10:30
GinjaNinja32
ea6cdd4f65 Merge pull request #11724 from Ccomp5950/I_Feel_NOTHING 
Fixes the icon for numbness.
 2015-12-22 03:00:51 +00:00
GinjaNinja32
ae7f59a23f Merge pull request #11725 from Ccomp5950/stumpy 
Stumpy hands and arms can no longer pull stuff out of bags and such.
 2015-12-22 03:00:21 +00:00
GinjaNinja32
073ef62976 Merge pull request #11723 from Ccomp5950/canisters 
Canisters now work in unpowered areas.
 2015-12-22 02:59:55 +00:00
GinjaNinja32
9c267539a3 Merge remote-tracking branch 'polaris/master' into pl-chemistry 2015-12-22 02:55:31 +00:00
Neerti
96b2d6faf2 Merge pull request #524 from Zuhayr/jobages 
Job age refactor.
 2015-12-21 21:02:29 -05:00
ccomp5950
fe62634775 Stumpy hands and arms can no longer pull stuff out of bags and such. 
Resolves #11404
 2015-12-21 17:56:30 -05:00
ccomp5950
5873a92df8 Fixes the icon for numbness. 
Resolves #11435
 2015-12-21 15:30:26 -05:00
ccomp5950
d574d60e26 Canisters now work in unpowered areas. 2015-12-21 15:00:25 -05:00
Mark9013100
cbbafa5170 Adds the black scrub cap 2015-12-21 12:25:43 -05:00
Neerti
45f74c4c47 Text macro added on request of PsiOmegaDelta. 2015-12-21 04:25:59 -05:00
Neerti
6fed0d4132 I'm an idiot. 2015-12-21 04:05:43 -05:00
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
Datraen
64f60e39e5 Forces new uplink NanoUIs to start at category menu, avoids grayed out options. 2015-12-21 03:07:49 -05:00
Neerti
0483cc3126 Merge pull request #637 from zekesulastin/flame-dress 
Adds black-with-blue-flame dress to custom loadout
 2015-12-21 00:09:18 -05:00
ZekeSulastin
a29dce6070 Adds black-with-blue-flame dress to custom loadout 2015-12-21 00:05:03 -05:00
Neerti
c25b36e542 Merge pull request #635 from Zuhayr/resomiremoval 
Removes Resomi.
 2015-12-20 21:18:01 -05:00
EmperorJon
0928e88e02 Merge pull request #636 from EmperorJon/21_Dec._Fix_general_flavour_text 
Fixes the general flavour text field.
 2015-12-21 00:31:47 +00:00
Jon
330c7c1cc8 Fixes the general flavour text field. 
The field was blanking each time it was opened to edit.
 2015-12-21 00:19:08 +00:00
Zuhayr
c9f579e00a Removes Resomi. 2015-12-21 09:56:11 +10:30