cyberpresidentvanellope/Polaris
1
0
Fork 0
mirror of https://github.com/PolarisSS13/Polaris.git synced 2025-12-15 20:52:07 +00:00
Code Issues Packages Projects Releases Wiki Activity
25,215 Commits 5 Branches 1 Tag
03412a24f8b08f6ea15e5468f1bbe57e9aec3f97
Commit Graph

18991 Commits

Author SHA1 Message Date
mwerezak
03412a24f8 Allows indirectly connected turfs to merge zones if either zone is small enough. 
Fixes #9235
 2015-06-06 23:24:11 -04:00
GinjaNinja32
3434826eaf Merge pull request #9490 from Zuhayr/xenoruins 
Random map generator expansion.
 2015-06-02 20:59:52 +01:00
Chinsky
58d9cb24a2 Merge pull request #9632 from PsiOmegaDelta/150602-Access 
Generalizes access definitions.
 2015-06-02 22:32:11 +03:00
Zuhayr
ebe62cefd8 Refactored random map generator system and added several terrain generators. 
Created a global list to track base turfs for explosions/shuttle moves.
Remaps the asteroid to be a moonlet. Tidies up some references to 'asteroid', removes moonbase from the accessible z level list.
 2015-06-03 04:36:19 +09:30
PsiOmegaDelta
3988d6ac90 Merge pull request #9388 from Techhead0/prisonBreak2.0 
Refactors and expands the Prison Break event.
 2015-06-02 18:58:20 +02:00
PsiOmegaDelta
88b80732e7 Generalizes access definitions. 
Access description, type, and area/region (medical, security, etc.) is now defined in a datum, ensuring the id modification consoles will (should) never be missing entries.
 2015-06-02 18:11:46 +02:00
Mloc
c1ce2f02b7 reorganize xgm into its own module 
Signed-off-by: Mloc <colmohici@gmail.com>
 2015-06-02 16:29:23 +01:00
PsiOmegaDelta
2c8c9df9d2 Merge remote-tracking branch 'upstream/dev-freeze' into dev 
Conflicts:
	html/changelogs/.all_changelog.yml
 2015-06-02 13:35:02 +02:00
PsiOmegaDelta
4a976e1ee2 Merge remote-tracking branch 'upstream/master' into dev-freeze 2015-06-02 13:13:40 +02:00
Zuhayr
717b191fe2 Minor refactor to reduce calls to handle_actions(). 2015-06-02 18:30:13 +09:30
Zuhayr
4a7b728fa2 Used some defines. No idea if this is what they are for but they have the same values #yolo 2015-06-02 17:20:10 +09:30
Zuhayr
dadc434f4e Ported action button system from Paradise/tg 2015-06-02 17:17:13 +09:30
PsiOmegaDelta
e70faa20ee Merge pull request #9629 from GinjaNinja32/spawn 
Spawn fixes
 2015-06-02 08:05:54 +02:00
GinjaNinja32
5ebece6368 Spawn fixes 
Fixes spawning a chem dispenser spamming the log with label settings
Fixes Spawn-Fruit and Spawn-Plant not being usable from hotbar
Fixes Spawn-Fruit and Spawn-Plant not producing admin logs (file only)
Allows spawning dispenser cartridges with different sizes and reagents
 2015-06-02 02:24:32 +01:00
Chinsky
26167895b5 Merge pull request #9621 from PsiOmegaDelta/150601-Adminhelp 
Admin PM replies now sent to IRC.
 2015-06-01 21:08:22 +03:00
PsiOmega
0aade86d5f Admin PM replies now sent to IRC. 
Now both ahelps and their replies should be sent to an IRC channel, if configured.
 2015-06-01 19:43:54 +02:00
Yoshax
63f253a301 Makes hyposprays start empty 2015-06-01 17:17:16 +01:00
PsiOmega
40a373a7fe APC event tweak. 
The APC event now instead checks for the new is_critical flag.
 2015-06-01 18:13:05 +02:00
PsiOmega
3d49ad3927 Merge remote-tracking branch 'upstream/dev-freeze' into dev 
Conflicts:
	code/game/jobs/job/job.dm
	code/game/jobs/job/silicon.dm
	code/game/objects/items/weapons/surgery_tools.dm
	code/modules/materials/materials.dm
	code/modules/mob/living/carbon/human/species/species.dm
	code/modules/mob/living/carbon/human/species/station/station.dm
	code/modules/organs/organ_external.dm
	icons/obj/objects.dmi
 2015-06-01 09:07:03 +02:00
Techhead0
637135b0b5 Removes relative pathing, adds better comments. 2015-06-01 00:02:56 -04:00
Techhead0
2b8d6db61e Refactors Prison Break event. 
Affects the Brig, Virology, Xenobiology or all three.
Adds warning messages to Engineering request consoles and AI.
Prevents doors from bolting open if unpowered
Reduces light overload frequency.
 2015-05-31 23:25:52 -04:00
Chinsky
ff592c751a Merge pull request #9483 from PsiOmegaDelta/150526-EndGameTweaks 
End game tweaks
 2015-05-31 23:55:08 +03:00
Chinsky
d39d9deeeb Merge pull request #9417 from mwerezak/chem-kinetics 
Chemistry reaction cleanup, Implements reaction-over-time and yield
 2015-05-31 23:54:39 +03:00
GinjaNinja32
d5e0a60a6b Merge pull request #9566 from PsiOmegaDelta/150529-Doors 
Fixes #9559.
 2015-05-31 20:11:33 +01:00
GinjaNinja32
c1cc002109 Merge pull request #9601 from Techhead0/survivalBox 
Survival box and job spawning fixes.
 2015-05-31 19:47:44 +01:00
Techhead0
9047bbe2a2 Removes O2 tank and spare mask from Vox boxes. 2015-05-31 14:17:24 -04:00
Techhead0
0f0fcf2d46 Re-adds extended oxygen tanks to relevant jobs. 2015-05-31 14:08:46 -04:00
Techhead0
aa2564b798 Fixes #9556 
Also fixes missing backpacks for assistants.
 2015-05-31 14:03:41 -04:00
Techhead0
99e9172d31 Cleans up Vox survival gear, adds belt icons to emergency nitrogen tanks. 2015-05-31 13:04:32 -04:00
PsiOmegaDelta
659873d943 Merge pull request #9598 from mwerezak/knifing 
Polishes the knifing mechanic
 2015-05-31 18:50:12 +02:00
Techhead0
3620c49b08 Fixes #9462 2015-05-31 12:41:39 -04:00
mwerezak
3f5976bc3b Updates knifing 
Fixes weirdness with knifing where attempting to knife someone before
`world.time >= (G.last_action + 20)` could be met.

Knifing damage scales with weapon force and an attempted measure of
throat protection.

Knifing switches on harm intent.
 2015-05-31 11:36:38 -04:00
PsiOmegaDelta
8d13f434f0 Merge pull request #9587 from Zuhayr/ipcfixes 
IPC fixes
 2015-05-31 15:53:11 +02:00
Chinsky
10218eb8c9 Merge pull request #9573 from Zuhayr/chairs 
Chair update.
 2015-05-31 11:33:24 +03:00
Zuhayr
201712eb3d Added MATERIAL_PADDING flag. 2015-05-31 17:19:32 +09:30
Zuhayr
fd2855800f Merge pull request #9582 from mwerezak/robolimbs 
limb fixes
 2015-05-31 17:14:25 +09:30
Zuhayr
1a4f3952d1 Cosmetic fixups. 2015-05-31 17:10:49 +09:30
mwerezak
d541fda7be Sets w_class for external organs 
Adjusts the edge w_class requirement to require a weapon that is larger
than or equal to the limb's w_class. Also makes the surgical saw and
surgical drill w_class = 3, and the scalpel w_class = 1.
 2015-05-30 19:02:37 -04:00
mwerezak
f23a656526 Replaces assignments to health with max_damage 
Except where they were already equal.
 2015-05-30 19:02:06 -04:00
mwerezak
217e7b966f sharp no longer causes DROPLIMB_EDGE 2015-05-30 19:01:34 -04:00
mwerezak
43cc0e6705 Fixes internal organs only being damaged with prob(5) if brute_dam >= max_damage 2015-05-30 19:01:01 -04:00
mwerezak
1c4239190d Having a vital internal organ die now kills you 
Internal organs now die once they hit max_health.
Also adjusts final brain damage effect.

Conflicts:
	code/modules/organs/organ.dm
 2015-05-30 18:53:20 -04:00
mwerezak
6b85a13de7 Merge remote-tracking branch 'upstream/dev' into chem-kinetics 
Conflicts:
	code/modules/reagents/Chemistry-Recipes.dm
 2015-05-30 17:25:57 -04:00
mwerezak
fd7830fd1b Adjusts most catalysts values 2015-05-30 17:21:33 -04:00
mwerezak
2d92a871aa Optimizes reaction checks 2015-05-30 17:21:05 -04:00
mwerezak
33487c76fa Implements reaction-over-time and reaction yield 2015-05-30 16:44:24 -04:00
PsiOmega
2f1202d5e0 Airlock fixes. 
Changes door closing to use the same sound playing setup as door opening. Fixes #9559.
 2015-05-30 20:41:25 +02:00
mwerezak
783b5aecc9 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into robolimbs2 
Conflicts:
	code/modules/mob/living/carbon/human/human_organs.dm
 2015-05-30 14:31:19 -04:00
Zuhayr
b3102824a0 Fixes #9544 2015-05-31 03:56:06 +09:30
mwerezak
cbeaabee9c Replaces setting ORGAN_ROBOT flag with robotize() call 2015-05-30 14:25:53 -04:00