cyberpresidentvanellope/Polaris
1
0
Fork 0
mirror of https://github.com/PolarisSS13/Polaris.git synced 2025-12-18 06:01:56 +00:00
Code Issues Packages Projects Releases Wiki Activity
24,593 Commits 5 Branches 1 Tag
cfb51cf19869d7290019e29a713006a29d3c0a94
Commit Graph

18513 Commits

Author SHA1 Message Date
Mloc
cfb51cf198 better nanoui caching + fixes 
Signed-off-by: Mloc <colmohici@gmail.com>
 2015-05-14 22:35:50 +01:00
Ccomp5950
1e6921f924 Merge pull request #9268 from Mloc/lightwrite 
fix for "cleaning light"
 2015-05-14 15:08:03 -04:00
Chinsky
8d83e8d452 Merge pull request #9202 from Zuhayr/customitems 
Custom items refactor.
 2015-05-14 21:47:04 +03:00
Chinsky
a4285a0c72 Merge pull request #9243 from PsiOmegaDelta/Mapping 
Fixes pipes on the asteroid disappearing into limbo.
 2015-05-14 20:43:08 +03:00
Chinsky
c1cb5c4829 Merge pull request #9245 from PsiOmegaDelta/ProcDivision 
Minor proc division.
 2015-05-14 20:38:57 +03:00
Mloc
d95701a7b5 fix for "cleaning light" 
Signed-off-by: Mloc <colmohici@gmail.com>
 2015-05-14 18:03:18 +01:00
Ccomp5950
4ec41c73ca Merge pull request #9195 from atlantiscze/radio-fix 
Fixes common channel radios not working.
 2015-05-14 12:34:43 -04:00
PsiOmega
9006419fcd Creates a default vent for atmospherics tanks. 2015-05-14 15:31:39 +02:00
Mloc
d6f4828f2a fix an issue with destroying light sources that have 0 light_range 
Signed-off-by: Mloc <colmohici@gmail.com>
 2015-05-14 10:58:52 +01:00
PsiOmegaDelta
9ed8f69e02 Merge pull request #9240 from Techhead0/internalsBox 
Moves survival boxes to species datums.
 2015-05-14 09:38:24 +02:00
PsiOmega
7b67b44e38 Minor proc division. 
Attempts to discourage the creation of large procs.
 2015-05-13 17:38:23 +02:00
Chinsky
2b1271d633 Merge pull request #9242 from PsiOmegaDelta/MechWreck 
Fixes #9221.
 2015-05-13 18:10:24 +03:00
Chinsky
ef79eb920d Merge pull request #9224 from PsiOmegaDelta/BrigGarbage 
Map cleaning.
 2015-05-13 18:09:28 +03:00
Chinsky
4108e82b6b Merge pull request #9208 from atlantiscze/rolling-brownouts 
Fixes dev power issues
 2015-05-13 18:09:16 +03:00
PsiOmega
cb5535a64b Fixes #9221. 
Removes premature loc = null change.
Also fixes an issue occuring when the impact of an ion bullet would wreck a mech before triggering the EMP.
This would cause null runtimes as a now removed object would be accessed.
 2015-05-13 12:37:18 +02:00
Techhead0
875a4fd893 Moves equip_survival_gear into job controller, species gear into datums. 2015-05-13 04:07:01 -04:00
Zuhayr
1dfade1a33 master>dev 2015-05-13 17:09:57 +09:30
Zuhayr
38e7cb8774 Minor amendments to mech kits and icons. 2015-05-13 17:04:52 +09:30
Zuhayr
3c10cc5852 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into customitems 2015-05-13 17:00:10 +09:30
Techhead0
93767c589e Adds beanbag shells to bar backroom. 
Also, fixes.
 2015-05-13 03:30:07 -04:00
Zuhayr
847f1baaa8 Merge pull request #9228 from Techhead0/portablepump-in 
PAPs now use external pressure when pumping in.
 2015-05-13 16:59:16 +09:30
Techhead0
f41300bbe3 Merge remote-tracking branch 'remotes/Baystation12/dev' into internalsBox 
Conflicts:
	maps/exodus-1.dmm
 2015-05-13 03:10:36 -04:00
Techhead0
e38ef1c7ef Moves survival boxes to species datums. 
Surivival gear is now assigned based on species. Most
species get standard gear, but Vox receive a nitrogen
tank instead, and Diona obtain an emergency flare
instead of a survival box.
As a side effect, engineers no longer spawn with larger
emergency tanks.
Fixes #9237
 2015-05-13 02:31:17 -04:00
Atlantiscze
616e9c773f Changes order of processing 
- Machinery is now processed before powernets, using data from previous tick. This fixes various UI issues with power related machinery, such as, SMES always showing output load of 100%. Otherwise has no changing effect on gameplay.
 2015-05-13 06:06:08 +02:00
Zuhayr
a9f936fe42 Added exosuit customisation kits to cargo. 2015-05-13 11:20:54 +09:30
Zuhayr
eef2f589ce Housekeeping. 2015-05-13 10:32:26 +09:30
Techhead0
bdf4400695 PAPs now use external pressure when pumping in. 
This allows Portable Air Pumps to be effectively used for draining rooms
and air tanks.
Also, default cells in pumps and scrubbers changed from 1k basic cells
to 5k heavy-duty cells.
 2015-05-12 13:55:06 -04:00
PsiOmega
ab6c4e74cb Merge remote-tracking branch 'upstream/dev' into BrigGarbage 2015-05-12 19:06:56 +02:00
Chinsky
ad67215b08 Merge pull request #9073 from PsiOmegaDelta/QDels 
Implementing Destroy():s
 2015-05-12 18:26:57 +03:00
Chinsky
c15c69b008 Merge pull request #8722 from Hubblenaut/dev 
Context-Based: Grab Intent [READY FOR REVIEW]
 2015-05-12 18:23:56 +03:00
Hubblenaut
32b463237f Final adjustments to icons, adds delay to pinning 2015-05-12 17:21:37 +02:00
Atlantiscze
165de0ad0e Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into rolling-brownouts 2015-05-12 17:19:36 +02:00
GinjaNinja32
c952507f3c Fixes carp attacking mechs over z-levels 
Fixes #9198.
 2015-05-12 15:53:28 +01:00
Zuhayr
f908119b98 Very minor oversight. 2015-05-12 23:56:51 +09:30
Zuhayr
e8d56e3aae Merge pull request #9213 from PsiOmegaDelta/TeleRuntime 
Fixes #9210.
 2015-05-12 23:49:17 +09:30
Zuhayr
4e85c5f387 Dev merge. 2015-05-12 23:33:29 +09:30
Zuhayr
9896bb4a9c Cleanup of custom item icons. 2015-05-12 23:21:23 +09:30
Chinsky
c36ac12d9f Merge pull request #9128 from mwerezak/canister_valve 
Fixes pressure overshoot when filling nearly empty tanks
 2015-05-12 16:29:32 +03:00
PsiOmegaDelta
57b5d43b4e Merge pull request #9218 from Zuhayr/hailers 
Allows hailer messages to be altered.
 2015-05-12 15:00:36 +02:00
Chinsky
009dc181b2 Merge pull request #9203 from mwerezak/vines2 
Updates weed control crate
 2015-05-12 15:58:47 +03:00
Hubblenaut
1b3ddb8633 Merge remote-tracking branch 'upstream/dev' into dev 
Conflicts:
	code/game/objects/structures/stool_bed_chair_nest/bed.dm
	code/modules/mob/mob_grab.dm
 2015-05-12 14:39:21 +02:00
PsiOmega
6bede81523 Map cleaning. 
Fixes some issues with windoor definitions.
Cleans up windoor usage.
Fixes  #9194, making it more evident where the disposal unit sends its goods.
 2015-05-12 14:24:27 +02:00
Zuhayr
da7bfd137b Renaming custom item icon files. 2015-05-12 21:39:46 +09:30
Zuhayr
49930fe55d Debugging! 2015-05-12 21:30:06 +09:30
PsiOmega
b52cf35680 Merge remote-tracking branch 'upstream/dev-freeze' into dev 
Conflicts:
	code/modules/projectiles/projectile.dm
 2015-05-12 13:40:47 +02:00
Zuhayr
2222445eb3 Merge pull request #9166 from MrSnapwalk/AI-and-pAI-sprites 
Adds 7 new AI core sprites and adds new pAI card sprites.
 2015-05-12 21:01:30 +09:30
Chinsky
e9cc39039c Merge pull request #8946 from Zuhayr/miningstuff 
Wall refactor/mining changes.
 2015-05-12 13:13:31 +03:00
PsiOmegaDelta
d12d1b93d1 Merge pull request #9204 from Ccomp5950/mangled_request 
Holodeck items no longer spam admin attack logs.
 2015-05-12 11:22:02 +02:00
Zuhayr
c8135cf87b Merge pull request #9205 from mwerezak/masks 
Snacks, drinks, and pills now check mouth coverage
 2015-05-12 18:11:48 +09:30
Zuhayr
b15ff78302 Merge pull request #9130 from mwerezak/device-powercell 
Adjusts charge cost for energy type guns
 2015-05-12 18:11:39 +09:30