HarpyEagle and Hubblenaut
7c758dfbb1
Updates changelog, fixes comment
2015-12-08 18:16:04 +01:00
HarpyEagle and Hubblenaut
a9d3f02cd5
Updates preset TTV bombs, adds debug verb
2015-12-08 18:15:55 +01:00
HarpyEagle and Hubblenaut
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 and Hubblenaut
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 and Hubblenaut
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
Neerti
c0198fa76d
Merge pull request #480 from Hubblenaut/master
...
Changes to Mob Bump Mechanics
2015-12-08 10:21:40 -05: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
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
Neerti
3376f9702f
Merge pull request #468 from Neerti/12/7/2015_big_game_hunt_for_radio_infinite_loop_runtime
...
Fixes radio hacking infinite loop.
2015-12-07 05:30:34 -05: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
Neerti
9f29e099ff
Merge pull request #467 from Neerti/12/7/2015_nanoUI_ports
...
Ports NanoUI fixes and changes from Bay
2015-12-07 03:47:02 -05:00
Neerti
f219980a3d
Fixed merge conflicts causing lack of compilation hopefully.
2015-12-07 03:38:38 -05:00
PsiOmegaDelta and Neerti
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 and Neerti
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 and Neerti
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 and Neerti
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
sabess
76a11a1fd0
Fixed stuff
2015-12-07 18:11:17 +11:00
Neerti
4ecddd7e8b
Adds attack_ghost() to base atmospherics object and APC to allow ghosts to see the nanoUI, and for admins to modify the objects from the interface.
2015-12-07 02:06:25 -05:00
Woodratt
b00cfca06f
Merge pull request #465 from Woodratt/Branch_1.2.4_airlock_fixes2
...
Simple Map Tweaks
2015-12-06 22:33:47 -08:00
woodratt
bf125baaa3
Simple Map Tweaks
...
- More hot fixes, D1a2 airlock and D1a4 fixed.
- Research and mining outposts hooked up to the air system.
- Adjusted xenoflora again.
- Minor fixes to atmospherics.
- Bockscar properly named
- ERT area re-skinned
2015-12-06 22:31:20 -08:00
sabess
47a6e38a8d
Added more reskins for the M1911, all of which have different sprites when empty. Added this functionality for the default M1911 as well as the default MK58s.
2015-12-07 14:25:06 +11:00
EmperorJon
dbbdbba15e
Merge pull request #462 from EmperorJon/06_Dec._Fix_cargo_shuttle_sand
...
Fixes cargo shuttle sand floor
2015-12-06 23:52:13 +00:00
Jon
5fa4164dc4
Snowflake cargo shuttles don't use the shuttle area. They've been updated to have space as a base turf.
2015-12-06 23:47:42 +00:00
Neerti
e54280b460
Merge pull request #437 from Yoshax/master
...
Adds ability to smash drinking bottles on things other than people
2015-12-06 09:15:46 -05:00
Neerti
e2f0e71731
Merge pull request #454 from Mark9013100/12/6/2015FixesandEdits2
...
Fixes #448 and #401 , custom loadout edit.
2015-12-06 09:11:53 -05:00
Neerti
769f66ca08
Merge pull request #455 from Neerti/12/6/2015_changelogs
...
12/6/2015 Changelogs
2015-12-06 09:11:37 -05:00
Neerti
9f5c5f7c60
Changelogs!
2015-12-06 09:05:37 -05:00
Mark9013100
457c40d46f
Fixes #448 and #401 , custom loadout edit.
2015-12-06 06:26:06 -05:00
SinTwo
10277880ee
Map and GitHub buttons
2015-12-06 01:47:38 -05:00
SinTwo
f8471fbbaf
Merge pull request #450 from GinjaNinja32/patch-1
...
fix rules button
2015-12-06 01:05:50 -05:00
GinjaNinja32
7024348ff3
fix rules button
2015-12-06 06:02:48 +00:00
Neerti
71abcaf25d
Merge pull request #445 from Neerti/12/5/2015_neerti_is_a_dumbass
...
Fixes debug verb making it into live.
2015-12-05 18:24:27 -05:00
Neerti
ffab1eda95
Fucking fuck.
2015-12-05 18:01:32 -05:00
Neerti
c808371780
Merge pull request #444 from Neerti/12/4/2015_communicators
...
Adds cellphones!
2015-12-05 17:37:35 -05:00
Neerti
3e946447a3
Adds cellphones! Details in the changelog entry.
2015-12-05 17:26:13 -05:00
Datraen
e480b826aa
Merge pull request #443 from Datraen/CargoTugFix12-5-2015
...
Cargo tug fix
2015-12-05 15:21:37 -05:00
Datraen
ca6a970182
Fixes the inability to use cargo tugs
2015-12-05 15:15:53 -05:00
Woodratt
93f2726078
Merge pull request #442 from Woodratt/1.2.2_Landmark_fixes
...
1.2.2 Minor landmark fixes
2015-12-05 11:50:42 -08:00
Datraen
bcc0e53d4b
Merge pull request #6 from PolarisSS13/master
...
Sync 12/5/2015
2015-12-05 14:22:44 -05:00
woodratt
06013b4c91
1.2.2 Minor landmark fixes
...
- Landmark points for the Chief Engineer and CMO readded.
2015-12-05 11:15:50 -08:00
