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
30,372 Commits 2 Branches 1 Tag
24f7c0ca2cac15f9aa55e32b50ec4162d563dfb3
Commit Graph

22674 Commits

Author SHA1 Message Date
Neerti
38833c18c4 Adds check if something in hand would have access before returning it. 2015-11-19 08:40:41 -05:00
Neerti
70ade2ed59 Fixes access checks ignoring the ID in your hand if already wearing an ID. 2015-11-19 08:00:07 -05:00
Neerti
4e712b5a73 Merge branch 'master' into 11/19/2015_gun_modes 2015-11-19 07:36:09 -05:00
Neerti
05ec2e7c28 Fixes gun mode switching. 2015-11-19 07:27:34 -05:00
Neerti
9473b7567e Fixes antags spawning in space. 2015-11-19 04:49:35 -05:00
PsiOmegaDelta
aa3a62fe32 Merge remote-tracking branch 'upstream/master' into dev-freeze 2015-11-19 08:59:24 +01:00
Chinsky
ed7386f306 Fixes #11356 2015-11-19 04:06:14 +03:00
Neerti
dd3ab4dac0 Finishes new ling, need better sprites but that's for another time. 2015-11-18 16:20:28 -05:00
GinjaNinja32
d247584d1b add a sleep inbetween disabling and enabling hardware mode 
i've been seeing HW mode not always re-enabling, hopefully this'll fix it
 2015-11-18 14:38:46 +00:00
PsiOmegaDelta
ee13279003 Merge pull request #11453 from Baystation12/master 
Dev-freeze
 2015-11-16 18:13:18 +01:00
PsiOmegaDelta
8584513652 Fixes the mining rig camera not properly showing up on the station camera list. 
Was using "Mine" instead of "MINE. Corrected by replacing all networks with the defined presets.
 2015-11-14 00:43:11 +01:00
Chinsky
f247ea1df6 Merge pull request #11379 from mwerezak/ipctemp 
Fixes #11354
 2015-11-12 02:02:45 +03:00
Chinsky
6f472df56a Merge pull request #11441 from Kelenius/lathefix 
Fixes #11347
 2015-11-12 02:02:29 +03:00
mwerezak
7e472af238 Fixes temperature HUD being incorrect for species with null body_temperature. 2015-11-10 23:53:18 -05:00
mwerezak
52deec9fde Adds thermal radiation into space for human mobs 
Main effect is that IPCs won't gain temperature infinitely anymore.
 2015-11-10 23:52:41 -05:00
Kelenius
531809efa2 Fixes #11347 
Jesus Christ how horrifying
 2015-11-10 14:15:37 +03:00
PsiOmegaDelta
2968952913 Merge pull request #11438 from Baystation12/master 
Dev-freeze
 2015-11-10 10:34:40 +01:00
SinTwo
c88689662c Merge pull request #1 from PolarisSS13/master 
Update
 2015-11-08 18:51:43 -05:00
SinTwo
8c816a9f28 Helmets 2015-11-08 18:10:34 -05:00
SinTwo
05377d0f5d Hoods 2015-11-08 18:10:19 -05:00
Neerti
4f77afece1 Revert 58ef59734f 2015-11-08 10:09:14 -05:00
PsiOmegaDelta
5c587e69b6 Exploit fix. 
Players can no longer immediately respawn as mice by ghosting.
 2015-11-07 17:12:50 +01:00
Neerti
f3c1be4241 Fixes socks and preview icon. 2015-11-06 23:20:50 -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
mwerezak
db59f87cb0 Merge pull request #11424 from PsiOmegaDelta/151106-RuntimeFlashing 
Fixes  #11422.
 2015-11-06 13:10:24 -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
31536c6a56 Fixes #11422. 
There is nothing to see here...
 2015-11-06 11:13:31 +01:00
Datraen
a1757ee696 Removes acetone and hydrazine from the chem list. 2015-11-05 19:41:04 -05:00
Datraen
6660b6f61c Tweaks plants to create a more diverse selection, different environment constants. 2015-11-05 18:43:05 -05:00
Chinsky
bef8d99703 Merge pull request #11409 from PsiOmegaDelta/151104-DionaLanguage 
When a diona splits, the main nymph inherits all known languages.
 2015-11-06 00:37:48 +03:00
PsiOmegaDelta
73f99a4c01 Secondary diona nymphs now get non-restricted/whitelisted languages on split. 2015-11-05 10:04:00 +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
PsiOmegaDelta
5f4af85af9 Refactors diona split code for maximum reuse. 2015-11-05 08:15:10 +01:00
PsiOmegaDelta
daa9b0e0bc When a diona splits, the main nymph inherits all known languages. 
Fixes #11401.
 2015-11-04 17:50:51 +01:00
Woodrat
0929cb4cc2 Woodrat v9.6 "Open Beta" 
- Minor tweaks to sleepers so they can can be set in different directions
- Sleepers and body scanners added to all maps
 2015-11-03 14:30:56 -08:00
PsiOmegaDelta
1648e46dcf Merge pull request #11408 from Baystation12/dev-freeze 
Dev
 2015-11-03 17:50:53 +01:00
PsiOmegaDelta
1fa73c0c18 Merge remote-tracking branch 'upstream/master' into dev-freeze 
Conflicts:
	code/modules/mob/living/carbon/human/life.dm
 2015-11-03 17:37:46 +01:00
PsiOmegaDelta
42b98c45e4 Merge pull request #11220 from caelaislinn/new_xenoarch_sprites 
Replaces xenoarch gun sprites with CC licenced alternatives from OpenGameArt.org
 2015-11-03 11:14:03 +01:00
HarpyEagle
f49b6d7cd1 Fixes #11405 2015-11-02 23:35:25 -05:00
PsiOmegaDelta
ae4d463fcb Map cleanup, tweaks and merge fixes. 2015-11-02 10:05:14 +01:00
PsiOmegaDelta
19051ec27e Merge remote-tracking branch 'upstream/dev-freeze' into dev 2015-11-02 09:25:04 +01:00
PsiOmegaDelta
694a35c10b Merge remote-tracking branch 'upstream/master' into dev-freeze 2015-11-02 09:08:06 +01:00
Chinsky
ba3c1f03d7 Merge pull request #11195 from Hubblenaut/dev 
CtrlClick deflates inflatables
 2015-11-02 00:11:14 +03:00
Chinsky
1417f4f40b Merge pull request #11344 from Hubblenaut/tape 
Tape - Sprites and Algorithm Changes
 2015-11-02 00:10:03 +03:00
Chinsky
e2bdcef127 Merge pull request #11386 from Dibasic/patch-1 
Reduces wizard subjugate duration
 2015-11-02 00:09:12 +03:00
Chinsky
4ae1a45017 Merge pull request #11389 from PsiOmegaDelta/152710-MagicCrescentWindows 
Crescent windows are now near indestructible.
 2015-11-02 00:08:52 +03:00
Chinsky
e05b08db10 Merge pull request #11394 from PsiOmegaDelta/151029-GasCircuits 
Atmospheric computer circuit additions.
 2015-11-02 00:08:35 +03:00
PsiOmegaDelta
392fd6210d Merge pull request #11388 from PsiOmegaDelta/151028-LiveDroneLIVE 
Allows drones to recharge their synth materials.
 2015-11-01 18:43:43 +01:00
Jon
221a4edc19 Attempts to revert and/or fix some of the changes that went into Bay Dev to alter sleepers/scanners. 
- Removes the NORTH/SOUTH sprites for the scanners, consoles, sleepers, etc. They're new, we don't use them, and I don't particularly like the look of them. We can add them back later if necessary.
- As per the new changes I've kept directional sprites as opposed to "thing-r" for right facing.
- The new body scanner sprite (white, whereas the previous is a grubby grey) has been reverted as it does not match the console.
- Sleeper console re-added, new sleeper NanoUI is still in but runs off the console not the sleeper.
- Proper directional stuff kept with the consoles, as far as I'm aware. By default the sleepers/scanners all have the consoles on the right. Light code changes will be needed to accommodate alternatives, the sprites still exist.
- Both consoles are animated and correctly disable animation with no power.
- Scanners are still entered with a verb, or clicking when grabbed, whereas sleepers are entered by click-dragging from the mob. This will probably want to be unified as I don't think this is how it used to be.
- Both consoles can be walked through, as was previously changed on Polaris.
- NO MAPPING CHANGES! The consoles work but will need to be mapped in to maps using the Polaris codebase.
 2015-10-31 22:55:17 +00:00