cyberpresidentvanellope/Polaris
1
0
Fork 0
mirror of https://github.com/PolarisSS13/Polaris.git synced 2025-12-20 07:02:30 +00:00
Code Issues Packages Projects Releases Wiki Activity
25,148 Commits 2 Branches 1 Tag
c38d88c06a25fbf5d518f48e1566bd7b5426afb5
Commit Graph

18945 Commits

Author SHA1 Message Date
Chinsky
dd008c7790 Merge pull request #9254 from PsiOmegaDelta/CellDepletion 
Using more energy than a cell has stored now drains the cell.
 2015-05-14 04:17:43 +03:00
PsiOmega
3d1b671703 Asking for more energy than a cell has stored now drains the cell. 
Fixes #9252.
 2015-05-13 23:38:49 +02:00
GinjaNinja32
428014c372 Layer and throwpass fix. 2015-05-13 22:06:27 +01:00
PsiOmega
91f67e5dc5 Adjusts rig stealth module costs. 
Activation and active power costs were previously a tenth of the same costs for a mere energy blade.
Now costs matches that of an energy blade.
 2015-05-13 22:38:52 +02:00
GinjaNinja32
5820873dab Makes gambling tables constructable. 2015-05-13 21:34:31 +01:00
GinjaNinja32
fb329fb8e0 Merge remote-tracking branch 'upstream/dev' into new_tables 2015-05-13 20:46:58 +01:00
I HATE GITHUB SO MUCH!
a7d0047b27 Fixes a problem with sql population logging where players and admins are placed on different rows 
Replaces two procs:
proc/sql_poll_admins()
proc/sql_poll_players()

With the proc:
proc/sql_poll_population()

Which does the same thing, except fixes and issue with sql logging, where player counts and admin counts would be placed in different rows:
Pictures for comparison:
Before: https://i.imgur.com/As4hAV8.png
After: http://i.imgur.com/ssm20IQ.png
 2015-05-13 20:46:36 +01:00
GinjaNinja32
a353c90159 Super-small fix. 2015-05-13 20:41:40 +01:00
GinjaNinja32
5f65565f45 Bugfixes, removing the remnants of table_parts, changelog. 2015-05-13 20:40:00 +01:00
GinjaNinja32
4b87799072 New tables, code section. Changelog entry soon. 2015-05-13 19:08:39 +01:00
Daranz
b95692e484 Fix a problem in human/has_eyes() 2015-05-13 13:58:37 -04: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
mwerezak
fe46049b17 Adds tail animations 
Adds a selection of emotes to control tail animations, and animated sprites for tajaran by 'Full of Skittles'
 2015-05-13 01:40:08 -04:00
Atlantiscze
090112c874 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into newmalf-merge 2015-05-13 06:17:26 +02: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
Atlantiscze
9d75d02a29 Minor fix 
- Fixes APCs rebuilt using frame replacement remaining hacked.
- Removes some old and unneeded commented-out code.
 2015-05-13 05:33:40 +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
Atlantiscze
3a583b88d1 Runtime Fix + Examine 
- Fixes rare runtime which sometimes occured with AI's powersupply object when AI was deleted.
- Examine of malf AI now correctly shows information about AI's backup charge and hardware (if AI has hardware installed)
 2015-05-12 21:47:52 +02:00
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