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
Neerti
e573581a28 Merge pull request #496 from Woodratt/1.2.6_Bar_Signs_and_Power 
1.2.6 Bar Sign and Power tweaks
 2015-12-09 03:41:48 -05:00
woodratt
b1735a3063 1.2.6 Bar Sign and Power tweaks 
- Created prescription Huds for medical and security. Two exist in the medical exam room, two in the security restroom.
- Boot Knives Bar Sign
- Tactical light in the warehouse replaced with a more low speed option
- Adjusted Atmos SMES to input from round start
- Adjusted Main SMES to start with about 70% power and a 700k Output.
 2015-12-09 00:21:26 -08:00
Hubblenaut
706e12e9ab Camera Hotfix 2015-12-09 09:03:01 +01:00
Neerti
894ad58277 Fixes people spawning in space. 
People were spawning in space due to a runtime error that occured when they choose the orange scarf, because the loadout entry lacked a path variable.
 2015-12-09 02:50:51 -05:00
Neerti
b5326950c4 Merge pull request #494 from Mark9013100/12/8/2015cratefix 
Removes duplicate webbing from webbing crate
 2015-12-09 02:33:42 -05:00
Mark9013100
7e68e3d490 Removes duplicate webbing from webbing crate 2015-12-08 22:16:55 -05:00
Neerti
4080710b3c Merge pull request #491 from PolarisSS13/12/8/2015_fixes_ghost_examine 
Fixes ghost examination bug.
 2015-12-08 21:46:04 -05:00
Neerti
8d22ded125 Merge pull request #493 from Hubblenaut/master 
Camera Hotfix
 2015-12-08 21:45:56 -05:00
Hubblenaut
97e33736c6 Camera Hotfix 2015-12-09 02:34:26 +01:00
EmperorJon
58e065444b Merge pull request #492 from EmperorJon/08_Dec._Skrell_snax_regulations_changes 
SkrellSnax are no longer contraband.
 2015-12-08 23:45:06 +00:00
Jon
99d1258d40 SkrellSnax are no longer contraband. 
All hail warblekind.
 2015-12-08 23:34:16 +00:00
Neerti
8d4770f798 Fixes ghost examination bug. 2015-12-08 18:13:00 -05:00
EmperorJon
0350ea5479 Merge pull request #484 from Hubblenaut/vendors 
Fixes #470
 2015-12-08 17:41:45 +00:00
EmperorJon
352825ef07 Merge pull request #481 from Hubblenaut/airlocks 
Airlocks buzz only once on failed closing attempt
 2015-12-08 17:41:09 +00:00
Hubblenaut
35a0562f57 Fixes #470 2015-12-08 18:24:06 +01:00
HarpyEagle
7c758dfbb1 Updates changelog, fixes comment 2015-12-08 18:16:04 +01:00
HarpyEagle
a9d3f02cd5 Updates preset TTV bombs, adds debug verb 2015-12-08 18:15:55 +01:00
HarpyEagle
326a6f445f Fixes #11071, #10936 
Adjusts fire_fuel_energy_release to compensate for fixed fire heat release.
Adjusts liquid fire burn parameters so that liquid fuel fire heat release and
burn duration is unaffected.

Conflicts:
	code/setup.dm
 2015-12-08 18:15:40 +01:00
HarpyEagle
ca52d2b3f2 Fixes calculate_firelevel() not counting oxidizer 
Fixes calculate_firelevel() not counting oxidizer when determining the ratio
of reactants to other gases. As well firelevel calculation is now done
separately for burning gas and burning liquid.

Adjusted FIRE_LIQUID_BURNRATE_MULT so that liquid burn rate is unaffected by
this fix, which will result in generally higher firelevels and thus faster
burn rates.

Conflicts:
	code/setup.dm
 2015-12-08 18:12:23 +01:00
HarpyEagle
b60146728c TTV Refactor 
Ensures TTV icon update occurs properly and removes the need for sleep() by
updating tank Destroy() to account for TTVs. Collects duplicated code into
a transfer_valve/remove_tank() proc.

Conflicts:
	code/game/objects/items/weapons/tanks/tanks.dm
 2015-12-08 17:54:15 +01:00
Hubblenaut
94d1ad8dc1 Doors buzz only once on failed closing 2015-12-08 16:13:31 +01:00
Hubblenaut
183ac02f32 Merge branch 'master' of https://github.com/PolarisSS13/Polaris 
Conflicts:
	html/changelogs/Hubblenaut-dev.yml
 2015-12-08 15:50:00 +01:00
Hubblenaut
baec8f15d1 Changes to Pushing Mechanics 2015-12-08 15:15:00 +01:00
Neerti
c56e6d173c Merge pull request #463 from Sabess/master 
Added more reskins for the M1911 and some other stuff.
 2015-12-08 08:15:19 -05:00
GinjaNinja32
0b76c62a8d Merge pull request #11632 from Ccomp5950/fix_nvgs_and_shit_that_changes_see_invis 
Fixes NVGs and other items that change see_invis.
 2015-12-08 08:13:45 +00:00
PsiOmegaDelta
0f986b0098 Compilation fixes. 2015-12-08 08:10:59 +01:00
PsiOmegaDelta
5fcf13ac55 Merge remote-tracking branch 'upstream/master' into dev-freeze 
Conflicts:
	code/game/objects/items/weapons/surgery_limbattachment.dm
	code/modules/mob/living/carbon/human/human_defense.dm
	code/modules/mob/living/carbon/human/species/species.dm
	code/modules/organs/organ.dm
	code/modules/organs/organ_external.dm
	code/setup.dm
 2015-12-08 08:09:37 +01:00
ccomp5950
c919aabfd5 Fixes NVGs and other items that change see_invis. 
I blame a bad merge or something.  There is no reason for vision changes to be made in this part of the code.
 2015-12-08 01:05:46 -05:00
SinTwo
149fe99fcb Merge pull request #476 from PolarisSS13/Sin2_fixes_12-7-15 
Jacket and Helmet Fix
 2015-12-07 23:07:50 -05:00
SinTwo
897e6c8382 Fixes some clothes. 2015-12-07 22:49:32 -05:00
Woodratt
74d5e804d7 Merge pull request #473 from Woodratt/1.2.5_WR_Bed_DLC2 
Woodrat 1.2.5 Bed DLC
 2015-12-07 19:31:09 -08:00
woodratt
21b6a4a102 Woodrat 1.2.5 Bed DLC 
- Fixed scrubber line on the Engineering outpost
- Dropped max storage space on the dufflebag from 56 to 38
- Changed bed and bedsheet sprites.
- Removed bedsheet from the psych couch.
 2015-12-07 19:18:04 -08:00
EmperorJon
2dc59a5c96 Merge pull request #469 from EmperorJon/07_Dec._Fix_SMG_desc 
Changes 12mm to 10mm.
 2015-12-07 23:59:50 +00:00
Jon
ef987c5124 Changes 12mm to 10mm. 2015-12-07 23:59:11 +00:00
Chinsky
1e5d6f9f57 Merge pull request #11567 from PsiOmegaDelta/151202-PlasmaCuttingPower 
Adds energy costs to some rig equipment.
 2015-12-07 19:58:19 +03:00
Chinsky
b1ec8253a1 Merge pull request #11587 from PsiOmegaDelta/151204-WizardsAreTheWorst 
Wizard spell Destroy() additions.
 2015-12-07 19:55:02 +03:00
GinjaNinja32
0b8bc7fb0b Merge pull request #11623 from BlueNexus/mechafix 
Fixes #11470
 2015-12-07 13:59:15 +00:00
BlueNexus
050c1f631a Added a missing update_icon() 2015-12-07 11:27:33 +00:00
BlueNexus
908ae91a08 Can no longer enter mechs while buckled 2015-12-07 11:17:12 +00:00
Neerti
e379810a07 Kills infinite loop, skins it, then makes a carpet out of it to decorate my imaginary room full of trophies of other bugs I've slain. 
The infinite loop occured due to the wire datum calling interact() on it's holder, which made it call Interact() on it's wire datum, and so on.
 2015-12-07 05:23:38 -05:00
Zuhayr
c2eba995ac Merge pull request #11604 from mwerezak/organ-tag-fix 
Organ fixes
 2015-12-07 19:13:09 +10:30
PsiOmegaDelta
9d0e13b977 Merge pull request #11608 from mwerezak/soap-fix 
Fixes runtime when cleaning turfs with soap
 2015-12-07 09:42:33 +01:00
Neerti
f219980a3d Fixed merge conflicts causing lack of compilation hopefully. 2015-12-07 03:38:38 -05:00
PsiOmegaDelta
a1203ed942 Fixes the broken Antag Uplink. 
NanoUI re-assigns src_object, rather than merely acquiring the host, causing ui_interact() updates to be called on the wrong object.
Fixes #11607.
 2015-12-07 03:06:56 -05:00
PsiOmegaDelta
15cc546556 Backports NanoUI fixes from dev. 
Fixes #11579.

Conflicts:
	code/modules/nano/modules/crew_monitor.dm
 2015-12-07 03:05:39 -05:00
PsiOmegaDelta
9db4ba1da0 Adds a remote interaction state for NanoUI. 
This state has two checks:
A preliminary check of the remote target, ensuring it's powered, etc. If the remote target is fully disabled, it closes the window and conducts no further checks.
It then makes a full check, ensuring that the mob is capable, within range of the source remoting to the remote target, etc.

Unlike most other static interaction states, whoever initializes the remote state is responsible for deleting it properly.

Conflicts:
	polaris.dme
 2015-12-07 02:56:43 -05:00
Neerti
f09dfe8347 Merge pull request #466 from Neerti/12/7/2015_apc_and_atmos_nanoUI_for_admins 
NanoUI interaction for ghosts on APCs/Atmos
 2015-12-07 02:49:50 -05:00
PsiOmegaDelta
443a376848 Ghosts can now view any object with a NanoUI interface. 
However, ghosts can now also only view objects in range to ensure that the NanoUI window count is kept low.
Admins do not suffer this restriction and may also interact with these windows.
 2015-12-07 02:35:33 -05:00
Neerti
2847d9a7ef Prepares for cherrypicking. 2015-12-07 02:35:20 -05:00
sabess
7e0a8f9145 Fixed notes, oops 2015-12-07 18:31:53 +11:00